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/0007-inputselector-Need-flush-when-set-active-pad-and-the.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/0007-inputselector-Need-flush-when-set-active-pad-and-the.patch')
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0/0007-inputselector-Need-flush-when-set-active-pad-and-the.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0007-inputselector-Need-flush-when-set-active-pad-and-the.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0007-inputselector-Need-flush-when-set-active-pad-and-the.patch deleted file mode 100644 index c5d329b..0000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0007-inputselector-Need-flush-when-set-active-pad-and-the.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 9860e95c4c6bcec422b6c83a2650ef76dd6a5488 Mon Sep 17 00:00:00 2001 -From: Song Bing <bing.song@nxp.com> -Date: Wed, 10 May 2017 11:24:46 +0800 -Subject: [PATCH 7/7] inputselector: Need flush when set active pad and then - seek in PAUSE state - - -Upstream-Status: Pending [https://bugzilla.gnome.org/show_bug.cgi?id=782417] - -Signed-off-by: Song Bing bing.song@nxp.com ---- - plugins/elements/gstinputselector.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c -index f6e1993..54400dd 100644 ---- a/plugins/elements/gstinputselector.c -+++ b/plugins/elements/gstinputselector.c -@@ -161,6 +161,7 @@ struct _GstSelectorPad - 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 @@ gst_selector_pad_reset (GstSelectorPad * pad) - 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 @@ gst_selector_pad_event (GstPad * pad, GstObject * parent, GstEvent * event) - 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 @@ gst_selector_pad_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) - 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); - -@@ -1389,8 +1394,12 @@ gst_input_selector_set_active_pad (GstInputSelector * self, GstPad * pad) - 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 ()); - --- -1.9.1 - |