From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Mon, 28 Nov 2011 01:10:20 +0000 (+0000)
Subject: queue2: fix refactoring of draining-on-eos, munge flow return to FLOW_OK
X-Git-Tag: RELEASE-0.10.36~55
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b28af5171ecdeb4f830944c8e534cd7a88c1868;p=platform%2Fupstream%2Fgstreamer.git

queue2: fix refactoring of draining-on-eos, munge flow return to FLOW_OK
---

diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c
index 9378d57..2440236 100644
--- a/plugins/elements/gstqueue2.c
+++ b/plugins/elements/gstqueue2.c
@@ -2448,6 +2448,9 @@ next:
       data = gst_queue2_dequeue_on_unexpected (queue, &item_type);
       if (data != NULL)
         goto next;
+      /* Since we will still accept EOS and NEWSEGMENT we return _FLOW_OK
+       * to the caller so that the task function does not shut down */
+      result = GST_FLOW_OK;
     }
   } else if (item_type == GST_QUEUE2_ITEM_TYPE_EVENT) {
     GstEvent *event = GST_EVENT_CAST (data);
@@ -2486,6 +2489,9 @@ next:
       data = gst_queue2_dequeue_on_unexpected (queue, &item_type);
       if (data != NULL)
         goto next;
+      /* Since we will still accept EOS and NEWSEGMENT we return _FLOW_OK
+       * to the caller so that the task function does not shut down */
+      result = GST_FLOW_OK;
     }
   }
   return result;