commit 5b5be73abd72bebee84d3d9272e02ac08ab95cfb
author Song Bing <bing.song@nxp.com> Wed May 11 16:57:23 2016 +0800
committer Lyon Wang <lyon.wang@nxp.com> Wed Dec 19 10:38:01 2018 +0800
tree 6b5c64a580a5c0180d776baf48a504168f824bcd
parent e94cdd1fb683f67236de8ddd66c969be06387cb4

inputselector: should proceed non-active pad buffer even if active pad reach eos

non-active pad will be blocked if active pad reach eos in inputselector.
Which will cause all pipeline be blocked.
Inputselector should proceed non-active pad buffer based on clock even
if active pad reach eos
Change to sync with clock for better user experience.

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

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 0359817..6e7e95d 100644
--- a/plugins/elements/gstinputselector.c
+++ b/plugins/elements/gstinputselector.c
@@ -772,7 +772,7 @@
     }
 
     cur_running_time = GST_CLOCK_TIME_NONE;
-    if (sel->sync_mode == GST_INPUT_SELECTOR_SYNC_MODE_CLOCK) {
+    if (sel->sync_mode == GST_INPUT_SELECTOR_SYNC_MODE_CLOCK || active_selpad->eos) {
       clock = gst_element_get_clock (GST_ELEMENT_CAST (sel));
       if (clock) {
         GstClockTime base_time;
@@ -823,7 +823,13 @@
           "Waiting for active streams to advance. %" GST_TIME_FORMAT " >= %"
           GST_TIME_FORMAT, GST_TIME_ARGS (running_time),
           GST_TIME_ARGS (cur_running_time));
-      GST_INPUT_SELECTOR_WAIT (sel);
+      if (active_selpad->eos) {
+        GST_INPUT_SELECTOR_UNLOCK (sel);
+        g_usleep (5000);
+        GST_INPUT_SELECTOR_LOCK (sel);
+      } else {
+        GST_INPUT_SELECTOR_WAIT (sel);
+      }
     } else {
       GST_INPUT_SELECTOR_UNLOCK (sel);
       break;