summaryrefslogtreecommitdiff
path: root/gst/playback/gstdecodebin2.c
diff options
context:
space:
mode:
authorThiago Santos <ts.santos@sisa.samsung.com>2014-07-11 18:51:44 -0300
committerSebastian Dröge <sebastian@centricular.com>2014-08-13 18:51:37 +0300
commit9c09c8ae17bc0d39c1b02d3ed83e64a5c80f807e (patch)
tree38fcf664c744b57669a8c06df87598eded535489 /gst/playback/gstdecodebin2.c
parent6bf3356967532d176a0dfd6150fe49be83171982 (diff)
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
Diffstat (limited to 'gst/playback/gstdecodebin2.c')
-rw-r--r--gst/playback/gstdecodebin2.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index b8d805244..7b1e0f3a4 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);