mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

videomixer: Do not take COLLECT_PADS_STREAM_LOCK when unnecessary

Browse source 
Collectpad takes the lock itself when receiving serialized events
and we should not take it for not serialized ones
This commit is contained in:
Thibault Saunier 2013-05-25 10:57:02 -04:00
parent 1b5a8ac41c
commit 608bd3e2db
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/videomixer/videomixer2.c
View file

@ -1717,14 +1717,11 @@ gst_videomixer2_sink_event (GstCollectPads * pads, GstCollectData * cdata,
break; break;
} }
case GST_EVENT_FLUSH_START: case GST_EVENT_FLUSH_START:
GST_COLLECT_PADS_STREAM_LOCK (mix->collect);
mix->flush_stop_pending = TRUE; mix->flush_stop_pending = TRUE;
GST_COLLECT_PADS_STREAM_UNLOCK (mix->collect);
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:
GST_COLLECT_PADS_STREAM_LOCK (mix->collect);
mix->newseg_pending = TRUE; mix->newseg_pending = TRUE;
if (mix->flush_stop_pending) { if (mix->flush_stop_pending) {
GST_DEBUG_OBJECT (pad, "forwarding flush stop"); GST_DEBUG_OBJECT (pad, "forwarding flush stop");
@ -1735,7 +1732,6 @@ gst_videomixer2_sink_event (GstCollectPads * pads, GstCollectData * cdata,
discard = TRUE; discard = TRUE;
GST_DEBUG_OBJECT (pad, "eating flush stop"); GST_DEBUG_OBJECT (pad, "eating flush stop");
} }
GST_COLLECT_PADS_STREAM_UNLOCK (mix->collect);
/* FIXME Should we reset in case we were not awaiting a flush stop? */ /* FIXME Should we reset in case we were not awaiting a flush stop? */
gst_videomixer2_reset_qos (mix); gst_videomixer2_reset_qos (mix);