commit d42548da09724ad8cc1aa4f1944607920be2f4c0
author Song Bing <bing.song@nxp.com> Wed May 10 11:24:46 2017 +0800
committer Lyon Wang <lyon.wang@nxp.com> Wed Dec 19 10:38:01 2018 +0800
tree f21e9b190bbafc02a2d81f36cbda4959e7be1f75
parent 036cdf1b849dacc01d842c341ee1e655e38826b9

inputselector: Need flush when set active pad and then seek in PAUSE state

https://bugzilla.gnome.org/show_bug.cgi?id=782417

Upstream Status: Pending.

Signed-off-by: Song Bing bing.song@nxp.com

plugins/elements/gstinputselector.c

diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c
index 6e7e95d..4b060cc 100644
--- a/plugins/elements/gstinputselector.c
+++ b/plugins/elements/gstinputselector.c
@@ -161,6 +161,7 @@
   guint32 segment_seqnum;       /* sequence number of the current segment */
 
   gboolean events_pending;      /* TRUE if sticky events need to be updated */
+  gboolean flush_events_pending;/* unblock old active track */
 
   gboolean sending_cached_buffers;
   GQueue *cached_buffers;
@@ -339,6 +340,7 @@
   pad->eos = FALSE;
   pad->eos_sent = FALSE;
   pad->events_pending = FALSE;
+  pad->flush_events_pending = FALSE;
   pad->discont = FALSE;
   pad->flushing = FALSE;
   gst_segment_init (&pad->segment, GST_FORMAT_UNDEFINED);
@@ -557,6 +559,8 @@
       selpad->flushing = TRUE;
       sel->eos = FALSE;
       selpad->group_done = FALSE;
+      if (selpad->flush_events_pending)
+        forward = TRUE;
       GST_INPUT_SELECTOR_BROADCAST (sel);
       break;
     case GST_EVENT_FLUSH_STOP:
@@ -1136,6 +1140,7 @@
     buf = gst_buffer_ref (buf);
   res = gst_pad_push (sel->srcpad, buf);
   GST_LOG_OBJECT (pad, "Buffer %p forwarded result=%d", buf, res);
+  selpad->flush_events_pending = FALSE;
 
   GST_INPUT_SELECTOR_LOCK (sel);
 
@@ -1393,8 +1398,12 @@
   active_pad_p = &self->active_sinkpad;
   gst_object_replace ((GstObject **) active_pad_p, GST_OBJECT_CAST (pad));
 
-  if (old && old != new)
+  if (old && old != new) {
     gst_pad_push_event (GST_PAD_CAST (old), gst_event_new_reconfigure ());
+    /* Old will be blocked on gst_pad_push() when set active pad in PAUSE
+     * state. Need flush when set active pad and then seek in PAUSE state */
+    old->flush_events_pending = TRUE;
+  }
   if (new)
     gst_pad_push_event (GST_PAD_CAST (new), gst_event_new_reconfigure ());