mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-11 00:55:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: fix collectpads test

Browse source 
After an EOS we must send a FLUSH_STOP event if
we want to send data again.
This commit is contained in:
Tim-Philipp Müller 2012-08-12 18:36:09 +01:00
parent b695d442fc
commit 1507ce3907
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/check/Makefile.am
View file

@ -139,13 +139,13 @@ check_PROGRAMS = \
libs/bitreader \ libs/bitreader \
libs/bytereader \ libs/bytereader \
libs/bytewriter \ libs/bytewriter \
libs/collectpads \
libs/gstnetclientclock \ libs/gstnetclientclock \
libs/gstnettimeprovider \ libs/gstnettimeprovider \
libs/transform1 libs/transform1
# failing tests # failing tests
noinst_PROGRAMS = \ noinst_PROGRAMS =
libs/collectpads
# elements to ignore for the state tests # elements to ignore for the state tests
# STATE_IGNORE_ELEMENTS = # STATE_IGNORE_ELEMENTS =

21
tests/check/libs/collectpads.c
View file

@ -79,10 +79,19 @@ collected_cb (GstCollectPads * pads, gpointer user_data)
static gpointer static gpointer
push_buffer (gpointer user_data) push_buffer (gpointer user_data)
{ {
GstFlowReturn flow;
GstCaps *caps;
TestData *test_data = (TestData *) user_data; TestData *test_data = (TestData *) user_data;
fail_unless (gst_pad_push (test_data->pad, test_data->buffer) gst_pad_push_event (test_data->pad, gst_event_new_stream_start ("test"));
== GST_FLOW_OK);
caps = gst_caps_new_empty_simple ("foo/x-bar");
gst_pad_push_event (test_data->pad, gst_event_new_caps (caps));
gst_caps_unref (caps);
flow = gst_pad_push (test_data->pad, test_data->buffer);
fail_unless (flow == GST_FLOW_OK, "got flow %s instead of OK",
gst_flow_get_name (flow));
return NULL; return NULL;
} }
@ -260,6 +269,8 @@ GST_START_TEST (test_collect_twice)
sinkpad2, sizeof (TestData)); sinkpad2, sizeof (TestData));
fail_unless (data2 != NULL); fail_unless (data2 != NULL);
GST_INFO ("round 1");
buf1 = gst_buffer_new (); buf1 = gst_buffer_new ();
/* start collect pads */ /* start collect pads */
@ -294,8 +305,14 @@ GST_START_TEST (test_collect_twice)
gst_collect_pads_stop (collect); gst_collect_pads_stop (collect);
collected = FALSE; collected = FALSE;
GST_INFO ("round 2");
buf2 = gst_buffer_new (); buf2 = gst_buffer_new ();
/* clear EOS from pads */
gst_pad_push_event (srcpad1, gst_event_new_flush_stop (TRUE));
gst_pad_push_event (srcpad2, gst_event_new_flush_stop (TRUE));
/* start collect pads */ /* start collect pads */
gst_collect_pads_start (collect); gst_collect_pads_start (collect);