mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 21:09:03 +02:00
gstreamer1.0-omx: Forward port bbappend to 1.14
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
53af636f88
commit
5492c68403
|
@ -1,23 +0,0 @@
|
||||||
From fc4773f36aa31b4ae0fc97d3aa3f94db0c88f194 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Thu, 11 Feb 2016 12:53:20 -0800
|
|
||||||
|
|
||||||
---
|
|
||||||
omx/gstomx.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/omx/gstomx.c b/omx/gstomx.c
|
|
||||||
index 0237f3c..45732c3 100644
|
|
||||||
--- a/omx/gstomx.c
|
|
||||||
+++ b/omx/gstomx.c
|
|
||||||
@@ -1538,8 +1538,8 @@ gst_omx_port_set_flushing (GstOMXPort * port, GstClockTime timeout,
|
|
||||||
last_error = OMX_ErrorNone;
|
|
||||||
gst_omx_component_handle_messages (comp);
|
|
||||||
while (signalled && last_error == OMX_ErrorNone && !port->flushed
|
|
||||||
- && port->buffers
|
|
||||||
- && port->buffers->len > g_queue_get_length (&port->pending_buffers)) {
|
|
||||||
+ /* && port->buffers
|
|
||||||
+ && port->buffers->len > g_queue_get_length (&port->pending_buffers) */) {
|
|
||||||
signalled = gst_omx_component_wait_message (comp, timeout);
|
|
||||||
if (signalled)
|
|
||||||
gst_omx_component_handle_messages (comp);
|
|
|
@ -1,27 +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(-)
|
|
||||||
|
|
||||||
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
|
|
||||||
index bad6335..c63b972 100644
|
|
||||||
--- a/omx/gstomxvideodec.c
|
|
||||||
+++ b/omx/gstomxvideodec.c
|
|
||||||
@@ -1911,8 +1911,11 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder,
|
|
||||||
5 * GST_SECOND) != OMX_ErrorNone)
|
|
||||||
return FALSE;
|
|
||||||
if (gst_omx_port_wait_buffers_released (out_port,
|
|
||||||
- 1 * GST_SECOND) != OMX_ErrorNone)
|
|
||||||
+ 1 * GST_SECOND) != OMX_ErrorNone) {
|
|
||||||
+#if !(defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL))
|
|
||||||
return FALSE;
|
|
||||||
+#endif
|
|
||||||
+ }
|
|
||||||
if (gst_omx_port_deallocate_buffers (self->dec_in_port) != OMX_ErrorNone)
|
|
||||||
return FALSE;
|
|
||||||
if (gst_omx_video_dec_deallocate_output_buffers (self) != OMX_ErrorNone)
|
|
|
@ -10,11 +10,11 @@ the drain request, leaving the decoder input thread waiting forever.
|
||||||
omx/gstomx.c | 7 +++++++
|
omx/gstomx.c | 7 +++++++
|
||||||
1 file changed, 7 insertions(+)
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
diff --git a/omx/gstomx.c b/omx/gstomx.c
|
Index: gst-omx-1.14.0/omx/gstomx.c
|
||||||
index 45732c3..784a5d7 100644
|
===================================================================
|
||||||
--- a/omx/gstomx.c
|
--- gst-omx-1.14.0.orig/omx/gstomx.c
|
||||||
+++ b/omx/gstomx.c
|
+++ gst-omx-1.14.0/omx/gstomx.c
|
||||||
@@ -737,6 +737,13 @@ gst_omx_component_new (GstObject * parent, const gchar * core_name,
|
@@ -837,6 +837,13 @@ gst_omx_component_new (GstObject * paren
|
||||||
|
|
||||||
g_mutex_lock (&comp->lock);
|
g_mutex_lock (&comp->lock);
|
||||||
gst_omx_component_handle_messages (comp);
|
gst_omx_component_handle_messages (comp);
|
|
@ -0,0 +1,24 @@
|
||||||
|
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,5 +1,5 @@
|
||||||
GSTREAMER_1_0_OMX_TARGET_rpi = "rpi"
|
GSTREAMER_1_0_OMX_TARGET_rpi = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "bellagio", "rpi", d)}"
|
||||||
GSTREAMER_1_0_OMX_CORE_NAME_rpi = "${libdir}/libopenmaxil.so"
|
GSTREAMER_1_0_OMX_CORE_NAME_rpi = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "${libdir}/libomxil-bellagio.so.0", d)}"
|
||||||
|
|
||||||
|
|
||||||
# How to make this RPI specific?
|
# How to make this RPI specific?
|
||||||
|
|
|
@ -4,10 +4,9 @@
|
||||||
SRC_URI_append_rpi = " \
|
SRC_URI_append_rpi = " \
|
||||||
file://0001-config-files-path.patch \
|
file://0001-config-files-path.patch \
|
||||||
file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \
|
file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \
|
||||||
file://0002-fix-decoder-flushing.patch \
|
|
||||||
file://0003-no-timeout-on-get-state.patch \
|
file://0003-no-timeout-on-get-state.patch \
|
||||||
file://0004-Properly-handle-drain-requests-while-flushing.patch \
|
file://0004-Properly-handle-drain-requests-while-flushing.patch \
|
||||||
file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \
|
file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
FILESEXTRAPATHS_prepend := "${THISDIR}/gstreamer1.0-omx-1.12:"
|
FILESEXTRAPATHS_prepend := "${THISDIR}/gstreamer1.0-omx-1.14:"
|
Loading…
Reference in New Issue
Block a user