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

funnel: Make sure to only lock the stream lock once

Browse source 
We also only unlock it once, and otherwise have it locked forever from
this thread, causing deadlocks on shutdown later.
This commit is contained in:
Sebastian Dröge 2016-11-09 11:37:09 +02:00
parent 5571ad1260
commit abe60a92c4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/elements/gstfunnel.c
View file

@ -403,8 +403,10 @@ gst_funnel_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
/* If no data is coming and we receive serialized event, need to forward all sticky events.
* Otherwise downstream has an inconsistent set of sticky events when
* handling the new event. */
unlock = TRUE;
GST_PAD_STREAM_LOCK (funnel->srcpad);
if (!unlock) {
unlock = TRUE;
GST_PAD_STREAM_LOCK (funnel->srcpad);
}
if ((funnel->last_sinkpad == NULL) || (funnel->forward_sticky_events
&& (funnel->last_sinkpad != pad))) {