mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

videomixer: Always handle flush_stop_pending atomically

Browse source 
It is not protected with the COLLECT_PADS_STREAM_LOCK anymore
This commit is contained in:
Thibault Saunier 2013-05-25 12:17:40 -04:00
parent 03fc515f66
commit 7a3df1ab31
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/videomixer/videomixer2.c
View file

@ -643,9 +643,7 @@ gst_videomixer2_reset (GstVideoMixer2 * mix)
} }
mix->newseg_pending = TRUE; mix->newseg_pending = TRUE;
GST_COLLECT_PADS_STREAM_LOCK (mix->collect); g_atomic_int_set (&mix->flush_stop_pending, FALSE);
mix->flush_stop_pending = FALSE;
GST_COLLECT_PADS_STREAM_UNLOCK (mix->collect);
} }
/* 1 == OK /* 1 == OK
@ -961,10 +959,9 @@ gst_videomixer2_collected (GstCollectPads * pads, GstVideoMixer2 * mix)
if (GST_VIDEO_INFO_FORMAT (&mix->info) == GST_VIDEO_FORMAT_UNKNOWN) if (GST_VIDEO_INFO_FORMAT (&mix->info) == GST_VIDEO_FORMAT_UNKNOWN)
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
if (mix->flush_stop_pending == TRUE) { if (g_atomic_int_compare_and_exchange (&mix->flush_stop_pending, TRUE, FALSE)) {
GST_DEBUG_OBJECT (mix, "pending flush stop"); GST_DEBUG_OBJECT (mix, "pending flush stop");
gst_pad_push_event (mix->srcpad, gst_event_new_flush_stop (TRUE)); gst_pad_push_event (mix->srcpad, gst_event_new_flush_stop (TRUE));
mix->flush_stop_pending = FALSE;
} }
if (mix->send_stream_start) { if (mix->send_stream_start) {
@ -1416,7 +1413,7 @@ gst_videomixer2_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
* forwarding the seek upstream or from gst_videomixer_collected, * forwarding the seek upstream or from gst_videomixer_collected,
* whichever happens first. * whichever happens first.
*/ */
mix->flush_stop_pending = TRUE; g_atomic_int_set (&mix->flush_stop_pending, TRUE);
} }
GST_COLLECT_PADS_STREAM_UNLOCK (mix->collect); GST_COLLECT_PADS_STREAM_UNLOCK (mix->collect);
@ -1717,16 +1714,16 @@ gst_videomixer2_sink_event (GstCollectPads * pads, GstCollectData * cdata,
break; break;
} }
case GST_EVENT_FLUSH_START: case GST_EVENT_FLUSH_START:
mix->flush_stop_pending = TRUE; g_atomic_int_set (&mix->flush_stop_pending, TRUE);
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;
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
mix->newseg_pending = TRUE; mix->newseg_pending = TRUE;
if (mix->flush_stop_pending) { if (g_atomic_int_compare_and_exchange (&mix->flush_stop_pending, TRUE,
FALSE)) {
GST_DEBUG_OBJECT (pad, "forwarding flush stop"); GST_DEBUG_OBJECT (pad, "forwarding flush stop");
ret = gst_collect_pads_event_default (pads, cdata, event, discard); ret = gst_collect_pads_event_default (pads, cdata, event, discard);
mix->flush_stop_pending = FALSE;
event = NULL; event = NULL;
} else { } else {
discard = TRUE; discard = TRUE;