mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 01:00:37 +00:00
tests/check/elements/: revert my freeze breakage
Original commit message from CVS: * tests/check/elements/audiopanorama.c: (cleanup_panorama): * tests/check/elements/avimux.c: (setup_avimux), (cleanup_avimux): * tests/check/elements/cmmldec.c: (setup_cmmldec), (teardown_cmmldec): * tests/check/elements/cmmlenc.c: (setup_cmmlenc), (teardown_cmmlenc): * tests/check/elements/level.c: (setup_level), (cleanup_level): revert my freeze breakage
This commit is contained in:
parent
373296698c
commit
72200b5b24
6 changed files with 11 additions and 18 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
||||||
|
2006-12-21 Stefan Kost <ensonic@users.sf.net>
|
||||||
|
|
||||||
|
* tests/check/elements/audiopanorama.c: (cleanup_panorama):
|
||||||
|
* tests/check/elements/avimux.c: (setup_avimux), (cleanup_avimux):
|
||||||
|
* tests/check/elements/cmmldec.c: (setup_cmmldec),
|
||||||
|
(teardown_cmmldec):
|
||||||
|
* tests/check/elements/cmmlenc.c: (setup_cmmlenc),
|
||||||
|
(teardown_cmmlenc):
|
||||||
|
* tests/check/elements/level.c: (setup_level), (cleanup_level):
|
||||||
|
revert my freeze breakage
|
||||||
|
|
||||||
2006-12-21 Stefan Kost <ensonic@users.sf.net>
|
2006-12-21 Stefan Kost <ensonic@users.sf.net>
|
||||||
|
|
||||||
* tests/check/elements/audiopanorama.c: (cleanup_panorama):
|
* tests/check/elements/audiopanorama.c: (cleanup_panorama):
|
||||||
|
|
|
@ -128,8 +128,6 @@ cleanup_panorama (GstElement * panorama)
|
||||||
g_list_free (buffers);
|
g_list_free (buffers);
|
||||||
buffers = NULL;
|
buffers = NULL;
|
||||||
|
|
||||||
gst_pad_set_active (mysrcpad, FALSE);
|
|
||||||
gst_pad_set_active (mysinkpad, FALSE);
|
|
||||||
gst_check_teardown_src_pad (panorama);
|
gst_check_teardown_src_pad (panorama);
|
||||||
gst_check_teardown_sink_pad (panorama);
|
gst_check_teardown_sink_pad (panorama);
|
||||||
gst_check_teardown_element (panorama);
|
gst_check_teardown_element (panorama);
|
||||||
|
|
|
@ -121,8 +121,6 @@ setup_avimux (GstStaticPadTemplate * srctemplate, gchar * sinkname)
|
||||||
avimux = gst_check_setup_element ("avimux");
|
avimux = gst_check_setup_element ("avimux");
|
||||||
mysrcpad = setup_src_pad (avimux, srctemplate, NULL, sinkname);
|
mysrcpad = setup_src_pad (avimux, srctemplate, NULL, sinkname);
|
||||||
mysinkpad = gst_check_setup_sink_pad (avimux, &sinktemplate, NULL);
|
mysinkpad = gst_check_setup_sink_pad (avimux, &sinktemplate, NULL);
|
||||||
gst_pad_set_active (mysrcpad, TRUE);
|
|
||||||
gst_pad_set_active (mysinkpad, TRUE);
|
|
||||||
|
|
||||||
return avimux;
|
return avimux;
|
||||||
}
|
}
|
||||||
|
@ -133,8 +131,6 @@ cleanup_avimux (GstElement * avimux, gchar * sinkname)
|
||||||
GST_DEBUG ("cleanup_avimux");
|
GST_DEBUG ("cleanup_avimux");
|
||||||
gst_element_set_state (avimux, GST_STATE_NULL);
|
gst_element_set_state (avimux, GST_STATE_NULL);
|
||||||
|
|
||||||
gst_pad_set_active (mysrcpad, FALSE);
|
|
||||||
gst_pad_set_active (mysinkpad, FALSE);
|
|
||||||
teardown_src_pad (avimux, sinkname);
|
teardown_src_pad (avimux, sinkname);
|
||||||
gst_check_teardown_sink_pad (avimux);
|
gst_check_teardown_sink_pad (avimux);
|
||||||
gst_check_teardown_element (avimux);
|
gst_check_teardown_element (avimux);
|
||||||
|
|
|
@ -136,8 +136,6 @@ setup_cmmldec ()
|
||||||
cmmldec = gst_check_setup_element ("cmmldec");
|
cmmldec = gst_check_setup_element ("cmmldec");
|
||||||
srcpad = gst_check_setup_src_pad (cmmldec, &srctemplate, NULL);
|
srcpad = gst_check_setup_src_pad (cmmldec, &srctemplate, NULL);
|
||||||
sinkpad = gst_check_setup_sink_pad (cmmldec, &sinktemplate, NULL);
|
sinkpad = gst_check_setup_sink_pad (cmmldec, &sinktemplate, NULL);
|
||||||
gst_pad_set_active (srcpad, TRUE);
|
|
||||||
gst_pad_set_active (sinkpad, TRUE);
|
|
||||||
|
|
||||||
bus = gst_bus_new ();
|
bus = gst_bus_new ();
|
||||||
gst_element_set_bus (cmmldec, bus);
|
gst_element_set_bus (cmmldec, bus);
|
||||||
|
@ -163,8 +161,6 @@ teardown_cmmldec ()
|
||||||
gst_object_unref (bus);
|
gst_object_unref (bus);
|
||||||
|
|
||||||
GST_DEBUG ("teardown_cmmldec");
|
GST_DEBUG ("teardown_cmmldec");
|
||||||
gst_pad_set_active (srcpad, FALSE);
|
|
||||||
gst_pad_set_active (sinkpad, FALSE);
|
|
||||||
gst_check_teardown_src_pad (cmmldec);
|
gst_check_teardown_src_pad (cmmldec);
|
||||||
gst_check_teardown_sink_pad (cmmldec);
|
gst_check_teardown_sink_pad (cmmldec);
|
||||||
gst_check_teardown_element (cmmldec);
|
gst_check_teardown_element (cmmldec);
|
||||||
|
|
|
@ -161,8 +161,6 @@ setup_cmmlenc ()
|
||||||
cmmlenc = gst_check_setup_element ("cmmlenc");
|
cmmlenc = gst_check_setup_element ("cmmlenc");
|
||||||
srcpad = gst_check_setup_src_pad (cmmlenc, &srctemplate, NULL);
|
srcpad = gst_check_setup_src_pad (cmmlenc, &srctemplate, NULL);
|
||||||
sinkpad = gst_check_setup_sink_pad (cmmlenc, &sinktemplate, NULL);
|
sinkpad = gst_check_setup_sink_pad (cmmlenc, &sinktemplate, NULL);
|
||||||
gst_pad_set_active (srcpad, TRUE);
|
|
||||||
gst_pad_set_active (sinkpad, TRUE);
|
|
||||||
|
|
||||||
bus = gst_bus_new ();
|
bus = gst_bus_new ();
|
||||||
gst_element_set_bus (cmmlenc, bus);
|
gst_element_set_bus (cmmlenc, bus);
|
||||||
|
@ -191,8 +189,6 @@ teardown_cmmlenc ()
|
||||||
gst_object_unref (bus);
|
gst_object_unref (bus);
|
||||||
|
|
||||||
GST_DEBUG ("teardown_cmmlenc");
|
GST_DEBUG ("teardown_cmmlenc");
|
||||||
gst_pad_set_active (srcpad, FALSE);
|
|
||||||
gst_pad_set_active (sinkpad, FALSE);
|
|
||||||
gst_check_teardown_src_pad (cmmlenc);
|
gst_check_teardown_src_pad (cmmlenc);
|
||||||
gst_check_teardown_sink_pad (cmmlenc);
|
gst_check_teardown_sink_pad (cmmlenc);
|
||||||
gst_check_teardown_element (cmmlenc);
|
gst_check_teardown_element (cmmlenc);
|
||||||
|
|
|
@ -72,8 +72,6 @@ setup_level ()
|
||||||
level = gst_check_setup_element ("level");
|
level = gst_check_setup_element ("level");
|
||||||
mysrcpad = gst_check_setup_src_pad (level, &srctemplate, NULL);
|
mysrcpad = gst_check_setup_src_pad (level, &srctemplate, NULL);
|
||||||
mysinkpad = gst_check_setup_sink_pad (level, &sinktemplate, NULL);
|
mysinkpad = gst_check_setup_sink_pad (level, &sinktemplate, NULL);
|
||||||
gst_pad_set_active (mysrcpad, TRUE);
|
|
||||||
gst_pad_set_active (mysinkpad, TRUE);
|
|
||||||
|
|
||||||
return level;
|
return level;
|
||||||
}
|
}
|
||||||
|
@ -83,8 +81,6 @@ cleanup_level (GstElement * level)
|
||||||
{
|
{
|
||||||
GST_DEBUG ("cleanup_level");
|
GST_DEBUG ("cleanup_level");
|
||||||
|
|
||||||
gst_pad_set_active (mysrcpad, FALSE);
|
|
||||||
gst_pad_set_active (mysinkpad, FALSE);
|
|
||||||
gst_check_teardown_src_pad (level);
|
gst_check_teardown_src_pad (level);
|
||||||
gst_check_teardown_sink_pad (level);
|
gst_check_teardown_sink_pad (level);
|
||||||
gst_check_teardown_element (level);
|
gst_check_teardown_element (level);
|
||||||
|
|
Loading…
Reference in a new issue