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

audiomixer: Make flush start/stop test non-racy

Browse source 
The flush stop could have happened between the source trying
to push the segment event and the buffer, this would cause a warning.
Prevent that by taking the source's stream lock while flushing.

https://bugzilla.gnome.org/show_bug.cgi?id=742684
This commit is contained in:
Olivier Crête 2015-01-21 19:09:13 -05:00 committed by Thibault Saunier
parent 0955a39a3d
commit 660ddd40c2
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/check/elements/audiomixer.c
View file

@ -1254,7 +1254,7 @@ GST_END_TEST;
GST_START_TEST (test_flush_start_flush_stop) GST_START_TEST (test_flush_start_flush_stop)
{ {
GstPadTemplate *sink_template; GstPadTemplate *sink_template;
GstPad *tmppad, *sinkpad1, *sinkpad2, *audiomixer_src; GstPad *tmppad, *srcpad1, *sinkpad1, *sinkpad2, *audiomixer_src;
GstElement *pipeline, *src1, *src2, *audiomixer, *sink; GstElement *pipeline, *src1, *src2, *audiomixer, *sink;
GST_INFO ("preparing test"); GST_INFO ("preparing test");
@ -1274,9 +1274,8 @@ GST_START_TEST (test_flush_start_flush_stop)
"sink_%u"); "sink_%u");
fail_unless (GST_IS_PAD_TEMPLATE (sink_template)); fail_unless (GST_IS_PAD_TEMPLATE (sink_template));
sinkpad1 = gst_element_request_pad (audiomixer, sink_template, NULL, NULL); sinkpad1 = gst_element_request_pad (audiomixer, sink_template, NULL, NULL);
tmppad = gst_element_get_static_pad (src1, "src"); srcpad1 = gst_element_get_static_pad (src1, "src");
gst_pad_link (tmppad, sinkpad1); gst_pad_link (srcpad1, sinkpad1);
gst_object_unref (tmppad);
sinkpad2 = gst_element_request_pad (audiomixer, sink_template, NULL, NULL); sinkpad2 = gst_element_request_pad (audiomixer, sink_template, NULL, NULL);
tmppad = gst_element_get_static_pad (src2, "src"); tmppad = gst_element_get_static_pad (src2, "src");
@ -1294,7 +1293,11 @@ GST_START_TEST (test_flush_start_flush_stop)
gst_pad_send_event (sinkpad1, gst_event_new_flush_start ()); gst_pad_send_event (sinkpad1, gst_event_new_flush_start ());
fail_if (GST_PAD_IS_FLUSHING (audiomixer_src)); fail_if (GST_PAD_IS_FLUSHING (audiomixer_src));
fail_unless (GST_PAD_IS_FLUSHING (sinkpad1)); fail_unless (GST_PAD_IS_FLUSHING (sinkpad1));
/* Hold the streamlock to make sure the flush stop is not between
the attempted push of a segment event and of the following buffer. */
GST_PAD_STREAM_LOCK (srcpad1);
gst_pad_send_event (sinkpad1, gst_event_new_flush_stop (TRUE)); gst_pad_send_event (sinkpad1, gst_event_new_flush_stop (TRUE));
GST_PAD_STREAM_UNLOCK (srcpad1);
fail_if (GST_PAD_IS_FLUSHING (audiomixer_src)); fail_if (GST_PAD_IS_FLUSHING (audiomixer_src));
fail_if (GST_PAD_IS_FLUSHING (sinkpad1)); fail_if (GST_PAD_IS_FLUSHING (sinkpad1));
gst_object_unref (audiomixer_src); gst_object_unref (audiomixer_src);
@ -1303,6 +1306,7 @@ GST_START_TEST (test_flush_start_flush_stop)
gst_object_unref (sinkpad1); gst_object_unref (sinkpad1);
gst_element_release_request_pad (audiomixer, sinkpad2); gst_element_release_request_pad (audiomixer, sinkpad2);
gst_object_unref (sinkpad2); gst_object_unref (sinkpad2);
gst_object_unref (srcpad1);
/* cleanup */ /* cleanup */
gst_element_set_state (pipeline, GST_STATE_NULL); gst_element_set_state (pipeline, GST_STATE_NULL);