Skip to content

Commit

Permalink
gstreamer1.0-omx: refresh and clean-up patches
Browse files Browse the repository at this point in the history
fixes:

    WARNING: gstreamer1.0-omx-1.12.4-r0 do_patch:
    Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
    The context lines in the patches can be updated with devtool:

        devtool modify <recipe>
        devtool finish --force-patch-refresh <recipe> <layer_path>

    Then the updated patches and the source tree (in devtool's workspace)
    should be reviewed to make sure the patches apply in the correct place
    and don't introduce duplicate lines (which can, and does happen
    when some of the context is ignored). Further information:
    http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
    https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
    Details:
    Applying patch 0001-config-files-path.patch
    patching file config/bellagio/gstomx.conf
    Hunk #1 succeeded at 1 with fuzz 2.
    Hunk #2 succeeded at 9 with fuzz 2.
    patching file config/rpi/gstomx.conf
    Hunk #8 succeeded at 63 with fuzz 2.
    Hunk #10 succeeded at 82 with fuzz 2.
    Hunk #11 succeeded at 92 with fuzz 2.

    Now at patch 0001-config-files-path.patch

deleted obsolete `gstreamer1.0-omx` directory with duplicated patches that are also in `gstreamer1.0-omx-1.12`.
made file naming for `gstreamer1.0-omx_%.bbappend` consistent with the rest of the layer recipes.

Signed-off-by: Hugo Hromic <[email protected]>
  • Loading branch information
hhromic authored and agherzan committed Mar 23, 2018
1 parent f86f9f0 commit 415c199
Show file tree
Hide file tree
Showing 11 changed files with 67 additions and 296 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2e111e52f96f0b942abda120c30a876629bd73fc Mon Sep 17 00:00:00 2001
From cfb432fcd8868c7a4f32010c61e47e2bf0ff80c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <[email protected]>
Date: Mon, 25 May 2015 14:53:35 +0200
Subject: [PATCH] Don't try to acquire buffer when src pad isn't active
Expand All @@ -23,15 +23,16 @@ arrive:
gst_omx_video_dec_loop()
gst_omx_port_acquire_buffer()
gst_omx_component_wait_message()

---
omx/gstomxvideodec.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index cd24944..57a61dd 100644
index d12ee8f..fb0100a 100644
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -1247,6 +1247,11 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
@@ -1250,6 +1250,11 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
GstClockTimeDiff deadline;
OMX_ERRORTYPE err;

Expand All @@ -43,6 +44,3 @@ index cd24944..57a61dd 100644
#if defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL)
port = self->eglimage ? self->egl_out_port : self->dec_out_port;
#else
--
1.8.3.2

Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
From 0dc88ed881eb8420dad4cf0934a900d85b6ef313 Mon Sep 17 00:00:00 2001
From: Khem Raj <[email protected]>
Date: Thu, 11 Feb 2016 12:53:20 -0800

---
config/bellagio/gstomx.conf | 8 ++++----
config/rpi/gstomx.conf | 22 +++++++++++-----------
2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/config/bellagio/gstomx.conf b/config/bellagio/gstomx.conf
index 5ca8ba6..8931255 100644
--- a/config/bellagio/gstomx.conf
+++ b/config/bellagio/gstomx.conf
@@ -1,6 +1,6 @@
Expand All @@ -6,18 +17,18 @@
-core-name=/usr/local/lib/libomxil-bellagio.so.0
+core-name=/usr/lib/libomxil-bellagio.so.0
component-name=OMX.st.video_decoder.mpeg4
rank=256
rank=257
in-port-index=0
@@ -9,7 +9,7 @@
@@ -9,7 +9,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang

[omxh264dec]
type-name=GstOMXH264Dec
-core-name=/usr/local/lib/libomxil-bellagio.so.0
+core-name=/usr/lib/libomxil-bellagio.so.0
component-name=OMX.st.video_decoder.avc
rank=256
rank=257
in-port-index=0
@@ -18,7 +18,7 @@
@@ -18,7 +18,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang

[omxmpeg4videoenc]
type-name=GstOMXMPEG4VideoEnc
Expand All @@ -26,7 +37,7 @@
component-name=OMX.st.video_encoder.mpeg4
rank=0
in-port-index=0
@@ -27,7 +27,7 @@
@@ -27,7 +27,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;video-framerate-integer;s

[omxaacenc]
type-name=GstOMXAACEnc
Expand All @@ -35,6 +46,8 @@
component-name=OMX.st.audio_encoder.aac
rank=0
in-port-index=0
diff --git a/config/rpi/gstomx.conf b/config/rpi/gstomx.conf
index d3ea56a..2508dae 100644
--- a/config/rpi/gstomx.conf
+++ b/config/rpi/gstomx.conf
@@ -1,6 +1,6 @@
Expand All @@ -45,7 +58,7 @@
component-name=OMX.broadcom.video_decode
rank=257
in-port-index=130
@@ -9,7 +9,7 @@
@@ -9,7 +9,7 @@ hacks=no-component-role

[omxmpeg4videodec]
type-name=GstOMXMPEG4VideoDec
Expand All @@ -54,7 +67,7 @@
component-name=OMX.broadcom.video_decode
rank=257
in-port-index=130
@@ -18,7 +18,7 @@
@@ -18,7 +18,7 @@ hacks=no-component-role

[omxh263dec]
type-name=GstOMXH263Dec
Expand All @@ -63,7 +76,7 @@
component-name=OMX.broadcom.video_decode
rank=257
in-port-index=130
@@ -27,7 +27,7 @@
@@ -27,7 +27,7 @@ hacks=no-component-role

[omxh264dec]
type-name=GstOMXH264Dec
Expand All @@ -72,7 +85,7 @@
component-name=OMX.broadcom.video_decode
rank=257
in-port-index=130
@@ -36,7 +36,7 @@
@@ -36,7 +36,7 @@ hacks=no-component-role;signals-premature-eos

[omxtheoradec]
type-name=GstOMXTheoraDec
Expand All @@ -81,7 +94,7 @@
component-name=OMX.broadcom.video_decode
rank=257
in-port-index=130
@@ -45,7 +45,7 @@
@@ -45,7 +45,7 @@ hacks=no-component-role

[omxvp8dec]
type-name=GstOMXVP8Dec
Expand All @@ -90,7 +103,7 @@
component-name=OMX.broadcom.video_decode
rank=257
in-port-index=130
@@ -54,7 +54,7 @@
@@ -54,7 +54,7 @@ hacks=no-component-role

[omxmjpegdec]
type-name=GstOMXMJPEGDec
Expand All @@ -99,16 +112,16 @@
component-name=OMX.broadcom.video_decode
rank=257
in-port-index=130
@@ -63,7 +63,7 @@
@@ -63,7 +63,7 @@ hacks=no-component-role

[omxvc1dec]
type-name=GstOMXWMVDec
-core-name=/opt/vc/lib/libopenmaxil.so
+core-name=/usr/lib/libopenmaxil.so
component-name=OMX.broadcom.video_decode
rank=256
rank=257
in-port-index=130
@@ -73,7 +73,7 @@
@@ -73,7 +73,7 @@ sink-template-caps=video/x-wmv,wmvversion=(int)3,format=(string){WMV3,WVC1},widt

[omxh264enc]
type-name=GstOMXH264Enc
Expand All @@ -117,21 +130,21 @@
component-name=OMX.broadcom.video_encode
rank=257
in-port-index=200
@@ -82,7 +82,7 @@
@@ -82,7 +82,7 @@ hacks=no-component-role;no-component-reconfigure

[omxanalogaudiosink]
type-name=GstOMXAnalogAudioSink
-core-name=/opt/vc/lib/libopenmaxil.so
+core-name=/usr/lib/libopenmaxil.so
component-name=OMX.broadcom.audio_render
rank=256
rank=257
in-port-index=100
@@ -92,7 +92,7 @@
@@ -92,7 +92,7 @@ sink-template-caps=audio/x-raw,format=(string){S16LE,S32LE},layout=(string)inter

[omxhdmiaudiosink]
type-name=GstOMXHdmiAudioSink
-core-name=/opt/vc/lib/libopenmaxil.so
+core-name=/usr/lib/libopenmaxil.so
component-name=OMX.broadcom.audio_render
rank=257
rank=258
in-port-index=100
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
From fc4773f36aa31b4ae0fc97d3aa3f94db0c88f194 Mon Sep 17 00:00:00 2001
From: Khem Raj <[email protected]>
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 69696c4..c382019 100644
index 0237f3c..45732c3 100644
--- a/omx/gstomx.c
+++ b/omx/gstomx.c
@@ -1508,8 +1508,8 @@ gst_omx_port_set_flushing (GstOMXPort * port, GstClockTime timeout,
@@ -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
Expand All @@ -13,4 +21,3 @@ index 69696c4..c382019 100644
signalled = gst_omx_component_wait_message (comp, timeout);
if (signalled)
gst_omx_component_handle_messages (comp);

Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
From 02e49cba402a783fa1b30e445b83a5c280949c1e Mon Sep 17 00:00:00 2001
From: Khem Raj <[email protected]>
Date: Sat, 13 Feb 2016 11:42:29 -0800

---
omx/gstomxvideodec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index 0d4e7a1..a0d9c74 100644
index fb0100a..bad6335 100644
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -1697,9 +1697,9 @@ gst_omx_video_dec_stop (GstVideoDecoder * decoder)
@@ -1713,9 +1713,9 @@ gst_omx_video_dec_stop (GstVideoDecoder * decoder)
g_cond_broadcast (&self->drain_cond);
g_mutex_unlock (&self->drain_lock);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
From 80dddfd13aaf2fe7272765f8cf291215fe375e28 Mon Sep 17 00:00:00 2001
From f00912f0628aff15e882bdc1619f5de1ddf5c720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <[email protected]>
Date: Tue, 17 Nov 2015 16:51:27 +0000
Subject: [PATCH] Properly handle drain requests while flushing

Without this commit the decoder streaming thread stops without ever attending
the drain request, leaving the decoder input thread waiting forever.

---
omx/gstomx.c | 7 +++++++
omx/gstomxvideodec.c | 13 +++++++++++++
2 files changed, 20 insertions(+)
omx/gstomx.c | 7 +++++++
1 file changed, 7 insertions(+)

Index: gst-omx-1.10.2/omx/gstomx.c
===================================================================
--- gst-omx-1.10.2.orig/omx/gstomx.c
+++ gst-omx-1.10.2/omx/gstomx.c
@@ -737,6 +737,13 @@ gst_omx_component_new (GstObject * paren
diff --git a/omx/gstomx.c b/omx/gstomx.c
index 45732c3..784a5d7 100644
--- a/omx/gstomx.c
+++ b/omx/gstomx.c
@@ -737,6 +737,13 @@ gst_omx_component_new (GstObject * parent, const gchar * core_name,

g_mutex_lock (&comp->lock);
gst_omx_component_handle_messages (comp);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 12103842d5f347cf245e71071d0c44297bcdb1f9 Mon Sep 17 00:00:00 2001
From 0d2ad639e6158c8023c157e206ef3ff7abdc089c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <[email protected]>
Date: Fri, 4 Dec 2015 18:39:59 +0100
Subject: [PATCH] Don't abort gst_omx_video_dec_set_format() if there's a
Expand All @@ -9,10 +9,10 @@ Subject: [PATCH] Don't abort gst_omx_video_dec_set_format() if there's a
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index 2368f34..da35e0d 100644
index bad6335..c63b972 100644
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -1905,8 +1905,11 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder,
@@ -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,
Expand All @@ -25,6 +25,3 @@ index 2368f34..da35e0d 100644
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)
--
2.1.4

Loading

0 comments on commit 415c199

Please sign in to comment.