mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 15:18:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin2: Don't take locks when deactivating pads

Browse source 
When deactivating pads, we need to ensure that the streaming threads
going through the pads we wish to deactivate can cleanly return.
Failure to do that would result in the streaming locks of those
pads never being released. The end result would be a deadlock
when stopping decodebin2.

In order to avoid that situation, release the "dyn" lock around
the deactivation code. And refactor the code to cope with the
list of blocked pads having potentially changed when re-acquiring
the lock.
This commit is contained in:
Edward Hervey 2017-11-14 13:34:48 +01:00 committed by Edward Hervey
parent c7917df7e2
commit 77e5a71a15
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/playback/gstdecodebin2.c
View file

@ -5211,14 +5211,14 @@ find_sink_pad (GstElement * element)
static void
unblock_pads (GstDecodeBin * dbin)
{
GList *tmp;
GST_LOG_OBJECT (dbin, "unblocking pads");
for (tmp = dbin->blocked_pads; tmp; tmp = tmp->next) {
while (dbin->blocked_pads) {
GList *tmp = dbin->blocked_pads;
GstDecodePad *dpad = (GstDecodePad *) tmp->data;
GstPad *opad;
dbin->blocked_pads = g_list_delete_link (dbin->blocked_pads, tmp);
opad = gst_ghost_pad_get_target (GST_GHOST_PAD_CAST (dpad));
if (opad) {
@ -5231,15 +5231,17 @@ unblock_pads (GstDecodeBin * dbin)
}
dpad->blocked = FALSE;
/* We release the dyn lock since we want to allow the streaming threads
* to properly stop and not be blocked in our various probes */
DYN_UNLOCK (dbin);
/* make flushing, prevent NOT_LINKED */
gst_pad_set_active (GST_PAD_CAST (dpad), FALSE);
gst_object_unref (dpad);
GST_DEBUG_OBJECT (dpad, "unblocked");
}
DYN_LOCK (dbin);
/* clear, no more blocked pads */
g_list_free (dbin->blocked_pads);
dbin->blocked_pads = NULL;
GST_DEBUG_OBJECT (dpad, "unblocked");
gst_object_unref (dpad);
}
}
static void