From e2536b1c5fc7653ab8475c9bc6730113d66e8ad4 Mon Sep 17 00:00:00 2001 From: Eunhye Choi Date: Tue, 13 Apr 2021 18:47:34 +0900 Subject: [PATCH] Revert "decodebin3: do not drop the eos event" This reverts commit e81e47479b49ffe98c3614ad2295c56e28e0b282. - To allow pad switching in case of adaptive streaming. Change-Id: Ic0102cc8cb83a2607ae7b24e8ff473df07a08dfa --- gst/playback/gstdecodebin3.c | 4 ---- packaging/gst-plugins-base.spec | 1 - 2 files changed, 5 deletions(-) diff --git a/gst/playback/gstdecodebin3.c b/gst/playback/gstdecodebin3.c index 7d2ceef..fdec1be 100644 --- a/gst/playback/gstdecodebin3.c +++ b/gst/playback/gstdecodebin3.c @@ -1941,9 +1941,7 @@ multiqueue_src_probe (GstPad * pad, GstPadProbeInfo * info, gst_mini_object_set_qdata (GST_MINI_OBJECT_CAST (ev), CUSTOM_EOS_QUARK, NULL, NULL); GST_LOG_OBJECT (pad, "Received custom EOS"); -#ifndef TIZEN_FEATURE_DISABLE_EOS_DROP ret = GST_PAD_PROBE_HANDLED; -#endif SELECTION_LOCK (dbin); if (slot->input == NULL) { GST_DEBUG_OBJECT (pad, @@ -2001,11 +1999,9 @@ multiqueue_src_probe (GstPad * pad, GstPadProbeInfo * info, GST_DEBUG_OBJECT (pad, "Got final eos, propagating downstream"); } else { GST_DEBUG_OBJECT (pad, "Got regular eos (all_inputs_are_eos)"); -#ifndef TIZEN_FEATURE_DISABLE_EOS_DROP /* drop current event as eos will be sent in check_all_slot_for_eos * when all output streams are also eos */ ret = GST_PAD_PROBE_DROP; -#endif SELECTION_LOCK (dbin); check_all_slot_for_eos (dbin); SELECTION_UNLOCK (dbin); diff --git a/packaging/gst-plugins-base.spec b/packaging/gst-plugins-base.spec index 2042a68..12580e5 100644 --- a/packaging/gst-plugins-base.spec +++ b/packaging/gst-plugins-base.spec @@ -94,7 +94,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing\ -DTIZEN_FEATURE_VOLUME_MODIFICATION\ -DTIZEN_FEATURE_FORCE_SW_DECODER\ -DTIZEN_FEATURE_U3_AVOID_DEADLOCK\ - -DTIZEN_FEATURE_DISABLE_EOS_DROP\ -DTIZEN_FEATURE_PLAYBIN3_MODIFICATION\ %if "%{tizen_profile_name}" == "tv" -DTIZEN_PROFILE_TV\ -- 2.7.4