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

videomixer: don't send flush_stop twice.

Browse source 
If we get flush start and a seek we need to only send flush_stop once.

More info at #706441
This commit is contained in:
Mathieu Duponchelle 2013-08-20 22:12:03 +02:00 committed by Thibault Saunier
parent 9b0bcc01a0
commit 5d21f8f2e3
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/videomixer/videomixer2.c
View file

@ -1435,6 +1435,7 @@ gst_videomixer2_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
* whichever happens first. * whichever happens first.
*/ */
g_atomic_int_set (&mix->flush_stop_pending, TRUE); g_atomic_int_set (&mix->flush_stop_pending, TRUE);
g_atomic_int_set (&mix->waiting_flush_stop, FALSE);
} }
GST_COLLECT_PADS_STREAM_UNLOCK (mix->collect); GST_COLLECT_PADS_STREAM_UNLOCK (mix->collect);
@ -1736,6 +1737,7 @@ gst_videomixer2_sink_event (GstCollectPads * pads, GstCollectData * cdata,
} }
case GST_EVENT_FLUSH_START: case GST_EVENT_FLUSH_START:
g_atomic_int_set (&mix->waiting_flush_stop, TRUE); g_atomic_int_set (&mix->waiting_flush_stop, TRUE);
g_atomic_int_set (&mix->flush_stop_pending, FALSE);
ret = gst_collect_pads_event_default (pads, cdata, event, discard); ret = gst_collect_pads_event_default (pads, cdata, event, discard);
event = NULL; event = NULL;
break; break;