From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Tue, 27 Sep 2011 13:48:52 +0000 (+0200)
Subject: collectpads2: avoid hanging in case of sparse newsegment events
X-Git-Tag: RELEASE-0.10.36~107
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce88f417b1c6ebb450e53efd272cf3649cf894c0;p=platform%2Fupstream%2Fgstreamer.git

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.
---

diff --git a/libs/gst/base/gstcollectpads2.c b/libs/gst/base/gstcollectpads2.c
index 18f6791..60e4663 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;
 }