From 9c09c8ae17bc0d39c1b02d3ed83e64a5c80f807e Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Fri, 11 Jul 2014 18:51:44 -0300 Subject: [PATCH] decodebin: consider all deadend pads as drained Otherwise when switching out a group with a deadend pad it will block as it would be waiting for EOS on a deadend that already got one https://bugzilla.gnome.org/show_bug.cgi?id=733169 --- gst/playback/gstdecodebin2.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c index b8d8052448..7b1e0f3a46 100644 --- a/gst/playback/gstdecodebin2.c +++ b/gst/playback/gstdecodebin2.c @@ -2653,8 +2653,13 @@ pad_event_cb (GstPad * pad, GstPadProbeInfo * info, gpointer data) GST_DEBUG_OBJECT (dbin, "Received EOS on a non final pad, this stream " "ended too early"); chain->deadend = TRUE; + chain->drained = TRUE; gst_object_replace ((GstObject **) & chain->current_pad, NULL); /* we don't set the endcaps because NULL endcaps means early EOS */ + + /* TODO check if this makes the next_group complete, but drained/deadend, + * meaning that it should be skipped and not exposed */ + EXPOSE_LOCK (dbin); if (gst_decode_chain_is_complete (dbin->decode_chain)) gst_decode_bin_expose (dbin);