mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-05 07:40:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

playbin3: Hold playbin lock on pad-added

Browse source 
Take the playbin lock when accessing the combiner
to add a new pad to link to. Fixes races against
streams-selected messages triggering reconfiguration.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2236>
This commit is contained in:
Jan Schmidt 2022-01-18 05:48:08 +11:00 committed by Tim-Philipp Müller
parent 5e3864159b
commit 45a709cf43
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-base/gst/playback/gstplaybin3.c
View file

@ -3113,6 +3113,7 @@ pad_added_cb (GstElement * uridecodebin, GstPad * pad, GstSourceGroup * group)
goto unknown_type;
}
GST_PLAY_BIN3_LOCK (playbin);
combine = &playbin->combiner[pb_stream_type];
combiner_control_pad (playbin, combine, pad);
@ -3127,6 +3128,7 @@ pad_added_cb (GstElement * uridecodebin, GstPad * pad, GstSourceGroup * group)
group->pending_about_to_finish = FALSE;
emit_about_to_finish (playbin);
}
GST_PLAY_BIN3_UNLOCK (playbin);
GST_PLAY_BIN3_SHUTDOWN_UNLOCK (playbin);