mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin2: Don't set the external ghostpads blocked but only their targets

Browse source 
Pad blocks should never be done on external pads as outside elements
might want to use their own pad blocks on them and this will lead to
conflicts and deadlocks.
This commit is contained in:
Sebastian Dröge 2009-09-26 12:10:21 +02:00
parent 0dcc0857aa
commit 999483b454
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/playback/gstdecodebin2.c
View file

@ -2484,7 +2484,7 @@ gst_decode_pad_init (GstDecodePad * pad)
} }
static void static void
source_pad_blocked_cb (GstDecodePad * dpad, gboolean blocked, gpointer unused) source_pad_blocked_cb (GstPad * opad, gboolean blocked, GstDecodePad * dpad)
{ {
GstDecodeGroup *group; GstDecodeGroup *group;
GstDecodeBin *dbin; GstDecodeBin *dbin;
@ -2531,10 +2531,16 @@ static void
gst_decode_pad_set_blocked (GstDecodePad * dpad, gboolean blocked) gst_decode_pad_set_blocked (GstDecodePad * dpad, gboolean blocked)
{ {
GstDecodeBin *dbin = dpad->dbin; GstDecodeBin *dbin = dpad->dbin;
GstPad *opad;
DECODE_BIN_DYN_LOCK (dbin); DECODE_BIN_DYN_LOCK (dbin);
gst_pad_set_blocked_async (GST_PAD (dpad), blocked, opad = gst_ghost_pad_get_target (GST_GHOST_PAD_CAST (dpad));
(GstPadBlockCallback) source_pad_blocked_cb, NULL); if (!opad)
goto out;
gst_pad_set_blocked_async_full (opad, blocked,
(GstPadBlockCallback) source_pad_blocked_cb, gst_object_ref (dpad),
(GDestroyNotify) gst_object_unref);
if (blocked) { if (blocked) {
if (dbin->shutdown) { if (dbin->shutdown) {
/* deactivate to force flushing state to prevent NOT_LINKED errors */ /* deactivate to force flushing state to prevent NOT_LINKED errors */
@ -2548,6 +2554,8 @@ gst_decode_pad_set_blocked (GstDecodePad * dpad, gboolean blocked)
gst_object_unref (dpad); gst_object_unref (dpad);
dbin->blocked_pads = g_list_remove (dbin->blocked_pads, dpad); dbin->blocked_pads = g_list_remove (dbin->blocked_pads, dpad);
} }
gst_object_unref (opad);
out:
DECODE_BIN_DYN_UNLOCK (dbin); DECODE_BIN_DYN_UNLOCK (dbin);
} }
@ -2659,15 +2667,20 @@ unblock_pads (GstDecodeBin * dbin)
for (tmp = dbin->blocked_pads; tmp; tmp = next) { for (tmp = dbin->blocked_pads; tmp; tmp = next) {
GstDecodePad *dpad = (GstDecodePad *) tmp->data; GstDecodePad *dpad = (GstDecodePad *) tmp->data;
GstPad *opad = gst_ghost_pad_get_target (GST_GHOST_PAD_CAST (dpad));
next = g_list_next (tmp); next = g_list_next (tmp);
if (!opad)
continue;
GST_DEBUG_OBJECT (dpad, "unblocking"); GST_DEBUG_OBJECT (dpad, "unblocking");
gst_pad_set_blocked_async (GST_PAD (dpad), FALSE, gst_pad_set_blocked_async_full (opad, FALSE,
(GstPadBlockCallback) source_pad_blocked_cb, NULL); (GstPadBlockCallback) source_pad_blocked_cb, gst_object_ref (dpad),
(GDestroyNotify) gst_object_unref);
/* make flushing, prevent NOT_LINKED */ /* make flushing, prevent NOT_LINKED */
GST_PAD_SET_FLUSHING (GST_PAD (dpad)); GST_PAD_SET_FLUSHING (GST_PAD (dpad));
gst_object_unref (dpad); gst_object_unref (dpad);
gst_object_unref (opad);
GST_DEBUG_OBJECT (dpad, "unblocked"); GST_DEBUG_OBJECT (dpad, "unblocked");
} }