From 608bd3e2db186d6d3a4a462a61f512e6efa987b0 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Sat, 25 May 2013 10:57:02 -0400 Subject: [PATCH] videomixer: Do not take COLLECT_PADS_STREAM_LOCK when unnecessary Collectpad takes the lock itself when receiving serialized events and we should not take it for not serialized ones --- gst/videomixer/videomixer2.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index 3be8984e8b..bf100d7e23 100644 --- a/gst/videomixer/videomixer2.c +++ b/gst/videomixer/videomixer2.c @@ -1717,14 +1717,11 @@ gst_videomixer2_sink_event (GstCollectPads * pads, GstCollectData * cdata, break; } case GST_EVENT_FLUSH_START: - GST_COLLECT_PADS_STREAM_LOCK (mix->collect); mix->flush_stop_pending = TRUE; - GST_COLLECT_PADS_STREAM_UNLOCK (mix->collect); ret = gst_collect_pads_event_default (pads, cdata, event, discard); event = NULL; break; case GST_EVENT_FLUSH_STOP: - GST_COLLECT_PADS_STREAM_LOCK (mix->collect); mix->newseg_pending = TRUE; if (mix->flush_stop_pending) { GST_DEBUG_OBJECT (pad, "forwarding flush stop"); @@ -1735,7 +1732,6 @@ gst_videomixer2_sink_event (GstCollectPads * pads, GstCollectData * cdata, discard = TRUE; 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? */ gst_videomixer2_reset_qos (mix);