diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-06-20 16:52:30 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-06-20 16:52:30 +0200 |
commit | 97af9b54157142f500c0322b49e669d893768850 (patch) | |
tree | e19216da2dc490aa5504c6dd45b2983c4633bc9f /recipes-multimedia/gstreamer/gstreamer1.0/0005-inputselector-should-proceed-non-active-pad-buffer-e.patch | |
parent | 1ea27c0e94885dfe703dafd49fe42a40a180554a (diff) |
Revert "imx-gst1.0-plugin: Add v4.3.1 and NXP specific gstreamer1.0 patches"
This resp. a later version got recently pulled into the rocko branch of
meta-freescale.
This reverts commit 5faa79028eead21680d490a1b589a3875f966e0e.
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0/0005-inputselector-should-proceed-non-active-pad-buffer-e.patch')
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0/0005-inputselector-should-proceed-non-active-pad-buffer-e.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0005-inputselector-should-proceed-non-active-pad-buffer-e.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0005-inputselector-should-proceed-non-active-pad-buffer-e.patch deleted file mode 100644 index f35ca04..0000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0005-inputselector-should-proceed-non-active-pad-buffer-e.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 7f7398acb5dc5fdc904f6684eab2bb072be25de7 Mon Sep 17 00:00:00 2001 -From: Song Bing <bing.song@nxp.com> -Date: Wed, 11 May 2016 16:57:23 +0800 -Subject: [PATCH 5/7] 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. - - -Upstream-Status: Pending [https://bugzilla.gnome.org/show_bug.cgi?id=766261] - -Signed-off-by: Song Bing bing.song@nxp.com ---- - plugins/elements/gstinputselector.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c -index f3f95e6..f6e1993 100644 ---- a/plugins/elements/gstinputselector.c -+++ b/plugins/elements/gstinputselector.c -@@ -772,7 +772,7 @@ gst_input_selector_wait_running_time (GstInputSelector * sel, - } - - 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 @@ gst_input_selector_wait_running_time (GstInputSelector * sel, - "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; --- -1.9.1 - |