mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 21:09:03 +02:00
gstreamer1.0-omx: Forward port bbappend and patches to v1.16.x
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
This commit is contained in:
parent
7059c37451
commit
36c3c2e7ca
|
@ -1,24 +0,0 @@
|
|||
From 0d2ad639e6158c8023c157e206ef3ff7abdc089c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com>
|
||||
Date: Fri, 4 Dec 2015 18:39:59 +0100
|
||||
Subject: [PATCH] Don't abort gst_omx_video_dec_set_format() if there's a
|
||||
timeout releasing the buffers taken by the egl_render out port
|
||||
|
||||
---
|
||||
omx/gstomxvideodec.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: gst-omx-1.14.0/omx/gstomxvideodec.c
|
||||
===================================================================
|
||||
--- gst-omx-1.14.0.orig/omx/gstomxvideodec.c
|
||||
+++ gst-omx-1.14.0/omx/gstomxvideodec.c
|
||||
@@ -2214,7 +2214,9 @@ gst_omx_video_dec_disable (GstOMXVideoDe
|
||||
return FALSE;
|
||||
if (gst_omx_port_wait_buffers_released (out_port,
|
||||
1 * GST_SECOND) != OMX_ErrorNone)
|
||||
+#if !(defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL))
|
||||
return FALSE;
|
||||
+#endif
|
||||
if (gst_omx_video_dec_deallocate_output_buffers (self) != OMX_ErrorNone)
|
||||
return FALSE;
|
||||
if (gst_omx_port_wait_enabled (out_port, 1 * GST_SECOND) != OMX_ErrorNone)
|
|
@ -1,8 +1,10 @@
|
|||
From cfb432fcd8868c7a4f32010c61e47e2bf0ff80c6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com>
|
||||
Date: Mon, 25 May 2015 14:53:35 +0200
|
||||
From 160181edf5fc73288abfe99fa04de4a550cd9c65 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 11 Feb 2016 12:53:20 -0800
|
||||
Subject: [PATCH] Don't try to acquire buffer when src pad isn't active
|
||||
|
||||
From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com>
|
||||
|
||||
This solves a race condition when setting the pipeline from PAUSE to
|
||||
NULL while the decoder loop is still running. Without this patch, the
|
||||
thread which interacts with the decode sink pad gets blocked here:
|
||||
|
@ -29,11 +31,11 @@ arrive:
|
|||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
|
||||
index d12ee8f..fb0100a 100644
|
||||
index abe6e30..c4dc33f 100644
|
||||
--- a/omx/gstomxvideodec.c
|
||||
+++ b/omx/gstomxvideodec.c
|
||||
@@ -1250,6 +1250,11 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
|
||||
GstClockTimeDiff deadline;
|
||||
@@ -1598,6 +1598,11 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
|
||||
GstOMXAcquireBufferReturn acq_return;
|
||||
OMX_ERRORTYPE err;
|
||||
|
||||
+ if (!gst_pad_is_active(GST_VIDEO_DECODER_SRC_PAD (self))) {
|
|
@ -1,4 +1,4 @@
|
|||
From 02e49cba402a783fa1b30e445b83a5c280949c1e Mon Sep 17 00:00:00 2001
|
||||
From 21f776bff596bc0bd09708efa6497f8bdcd065c0 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 13 Feb 2016 11:42:29 -0800
|
||||
|
||||
|
@ -7,10 +7,10 @@ Date: Sat, 13 Feb 2016 11:42:29 -0800
|
|||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
|
||||
index fb0100a..bad6335 100644
|
||||
index c4dc33f..ba5304f 100644
|
||||
--- a/omx/gstomxvideodec.c
|
||||
+++ b/omx/gstomxvideodec.c
|
||||
@@ -1713,9 +1713,9 @@ gst_omx_video_dec_stop (GstVideoDecoder * decoder)
|
||||
@@ -2021,9 +2021,9 @@ gst_omx_video_dec_stop (GstVideoDecoder * decoder)
|
||||
g_cond_broadcast (&self->drain_cond);
|
||||
g_mutex_unlock (&self->drain_lock);
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From f00912f0628aff15e882bdc1619f5de1ddf5c720 Mon Sep 17 00:00:00 2001
|
||||
From 140bf8548843a98b0af2ddc1765ab59c16c8994c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com>
|
||||
Date: Tue, 17 Nov 2015 16:51:27 +0000
|
||||
Subject: [PATCH] Properly handle drain requests while flushing
|
||||
|
@ -10,11 +10,11 @@ the drain request, leaving the decoder input thread waiting forever.
|
|||
omx/gstomx.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
Index: gst-omx-1.14.0/omx/gstomx.c
|
||||
===================================================================
|
||||
--- gst-omx-1.14.0.orig/omx/gstomx.c
|
||||
+++ gst-omx-1.14.0/omx/gstomx.c
|
||||
@@ -837,6 +837,13 @@ gst_omx_component_new (GstObject * paren
|
||||
diff --git a/omx/gstomx.c b/omx/gstomx.c
|
||||
index 038ce32..5202d33 100644
|
||||
--- a/omx/gstomx.c
|
||||
+++ b/omx/gstomx.c
|
||||
@@ -1011,6 +1011,13 @@ gst_omx_component_new (GstObject * parent, const gchar * core_name,
|
||||
|
||||
g_mutex_lock (&comp->lock);
|
||||
gst_omx_component_handle_messages (comp);
|
|
@ -0,0 +1,36 @@
|
|||
From cf6cf2060c5a7a7ddc0396a0c20c234fc56c79b6 Mon Sep 17 00:00:00 2001
|
||||
From: Andrei Gherzan <andrei@gherzan.ro>
|
||||
Date: Tue, 28 May 2019 18:02:24 +0100
|
||||
Subject: [PATCH] Don't abort gst_omx_video_dec_set_format() if there's a
|
||||
timeout releasing the buffers taken by the egl_render out port
|
||||
|
||||
From 0d2ad639e6158c8023c157e206ef3ff7abdc089c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?=
|
||||
<eocanha@igalia.com>
|
||||
Date: Fri, 4 Dec 2015 18:39:59 +0100
|
||||
Subject: [PATCH] Don't abort gst_omx_video_dec_set_format() if there's a
|
||||
timeout releasing the buffers taken by the egl_render out port
|
||||
|
||||
Upstream-status: Pending
|
||||
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
|
||||
---
|
||||
omx/gstomxvideodec.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
|
||||
index ba5304f..8bd5d3d 100644
|
||||
--- a/omx/gstomxvideodec.c
|
||||
+++ b/omx/gstomxvideodec.c
|
||||
@@ -2229,7 +2229,9 @@ gst_omx_video_dec_disable (GstOMXVideoDec * self)
|
||||
return FALSE;
|
||||
if (gst_omx_port_wait_buffers_released (out_port,
|
||||
1 * GST_SECOND) != OMX_ErrorNone)
|
||||
+#if !(defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL))
|
||||
return FALSE;
|
||||
+#endif
|
||||
if (!gst_omx_video_dec_deallocate_output_buffers (self))
|
||||
return FALSE;
|
||||
if (gst_omx_port_wait_enabled (out_port, 1 * GST_SECOND) != OMX_ErrorNone)
|
||||
--
|
||||
2.17.1
|
||||
|
|
@ -9,4 +9,4 @@ SRC_URI_append_rpi = " \
|
|||
file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \
|
||||
"
|
||||
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/gstreamer1.0-omx-1.14:"
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/gstreamer1.0-omx-1.16:"
|
Loading…
Reference in New Issue
Block a user