From 9a9c15cec379c3b38c1ac2d74330b5f526d84dfc Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 21 Dec 2006 08:16:41 +0000 Subject: [PATCH] gst/asfdemux/gstasfdemux.c: add a comment about a future change Original commit message from CVS: * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_get_gst_tag_from_tag_name), (gst_asf_demux_process_ext_content_desc): add a comment about a future change * tests/check/elements/amrnbenc.c: (setup_amrnbenc), (cleanup_amrnbenc): * tests/check/elements/mpeg2dec.c: (setup_mpeg2dec), (cleanup_mpeg2dec): consistent pad (de)activation --- ChangeLog | 13 +++++++++++++ gst/asfdemux/gstasfdemux.c | 3 +++ tests/check/elements/amrnbenc.c | 4 ++++ tests/check/elements/mpeg2dec.c | 4 ++++ 4 files changed, 24 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4895928..c102f55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2006-12-21 Stefan Kost + + * gst/asfdemux/gstasfdemux.c: + (gst_asf_demux_get_gst_tag_from_tag_name), + (gst_asf_demux_process_ext_content_desc): + add a comment about a future change + + * tests/check/elements/amrnbenc.c: (setup_amrnbenc), + (cleanup_amrnbenc): + * tests/check/elements/mpeg2dec.c: (setup_mpeg2dec), + (cleanup_mpeg2dec): + consistent pad (de)activation + 2006-12-15 Tim-Philipp Müller * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_get_src_query_types): diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 976f21f..fb446c3 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -1240,6 +1240,9 @@ gst_asf_demux_process_ext_content_desc (GstASFDemux * demux, guint8 ** p_data, * WM/EncodingTime * WM/MCDI * IsVBR + * + * We might want to read WM/TrackNumber and use atoi() if we don't have + * WM/Track */ GstTagList *taglist; diff --git a/tests/check/elements/amrnbenc.c b/tests/check/elements/amrnbenc.c index fb173a2..c6b26c6 100644 --- a/tests/check/elements/amrnbenc.c +++ b/tests/check/elements/amrnbenc.c @@ -77,6 +77,8 @@ setup_amrnbenc () amrnbenc = gst_check_setup_element ("amrnbenc"); srcpad = gst_check_setup_src_pad (amrnbenc, &srctemplate, NULL); sinkpad = gst_check_setup_sink_pad (amrnbenc, &sinktemplate, NULL); + gst_pad_set_active (mysrcpad, TRUE); + gst_pad_set_active (mysinkpad, TRUE); bus = gst_bus_new (); gst_element_set_bus (amrnbenc, bus); @@ -104,6 +106,8 @@ cleanup_amrnbenc (GstElement * amrnbenc) gst_object_unref (bus); GST_DEBUG ("cleanup_amrnbenc"); + gst_pad_set_active (mysrcpad, FALSE); + gst_pad_set_active (mysinkpad, FALSE); gst_check_teardown_src_pad (amrnbenc); gst_check_teardown_sink_pad (amrnbenc); gst_check_teardown_element (amrnbenc); diff --git a/tests/check/elements/mpeg2dec.c b/tests/check/elements/mpeg2dec.c index d1ad929..2ce7c6d 100644 --- a/tests/check/elements/mpeg2dec.c +++ b/tests/check/elements/mpeg2dec.c @@ -1347,6 +1347,8 @@ setup_mpeg2dec () mpeg2dec = gst_check_setup_element ("mpeg2dec"); mysrcpad = gst_check_setup_src_pad (mpeg2dec, &srctemplate, NULL); mysinkpad = gst_check_setup_sink_pad (mpeg2dec, &sinktemplate, NULL); + gst_pad_set_active (mysrcpad, TRUE); + gst_pad_set_active (mysinkpad, TRUE); return mpeg2dec; } @@ -1357,6 +1359,8 @@ cleanup_mpeg2dec (GstElement * mpeg2dec) GST_DEBUG ("cleanup_mpeg2dec"); gst_element_set_state (mpeg2dec, GST_STATE_NULL); + gst_pad_set_active (mysrcpad, FALSE); + gst_pad_set_active (mysinkpad, FALSE); gst_check_teardown_src_pad (mpeg2dec); gst_check_teardown_sink_pad (mpeg2dec); gst_check_teardown_element (mpeg2dec); -- 2.7.4