From ce88f417b1c6ebb450e53efd272cf3649cf894c0 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Tue, 27 Sep 2011 15:48:52 +0200 Subject: [PATCH] collectpads2: avoid hanging in case of sparse newsegment events ... in the extent that a non-waiting pad (so indicated by newsegment) turns out to provide the best buffer, which is then forced to waiting for book-keeping purposes, but that should only be temporary. See bug #415754. --- libs/gst/base/gstcollectpads2.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/gst/base/gstcollectpads2.c b/libs/gst/base/gstcollectpads2.c index 18f6791bba..60e4663a6d 100644 --- a/libs/gst/base/gstcollectpads2.c +++ b/libs/gst/base/gstcollectpads2.c @@ -1544,6 +1544,11 @@ gst_collect_pads2_default_collected (GstCollectPads2 * pads, gpointer user_data) buffer = gst_collect_pads2_pop (pads, best); ret = func (pads, best, buffer, buffer_user_data); + /* maybe non-waiting was forced to waiting above due to + * newsegment events coming too sparsely, + * so re-check to restore state to avoid hanging/waiting */ + gst_collect_pads2_recalculate_full (pads); + done: return ret; }