Skip to content

Commit

Permalink
rpi: gstreamer1.0-omx: update patches to apply on 1.18.1 version
Browse files Browse the repository at this point in the history
:Release Notes:

:Detailed Notes:
Fixes:
ERROR: Fuzz detected:

checking file omx/gstomxvideodec.c
Hunk webosose#5 succeeded at 2801 with fuzz 2 (offset 9 lines).
Hunk webosose#6 succeeded at 3007 (offset 15 lines).
Hunk webosose#7 succeeded at 3321 (offset 15 lines).
checking file omx/gstomxvideodec.h

patching file omx/gstomxvideodec.c
Hunk webosose#5 succeeded at 2801 with fuzz 2 (offset 9 lines).
Hunk webosose#6 succeeded at 3007 (offset 15 lines).
Hunk webosose#7 succeeded at 3321 (offset 15 lines).
patching file omx/gstomxvideodec.h

The context lines in the patches can be updated with devtool:

    devtool modify gstreamer1.0-omx
    devtool finish --force-patch-refresh gstreamer1.0-omx <layer_path>

Don't forget to review changes done by devtool!

ERROR: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz]

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[PLAT-124341] Create GPVB with Yocto 3.3 Hardknott

Change-Id: I83db3a27a7997e68c41272a1a474c4e5bdd48247
  • Loading branch information
shr-project committed Nov 13, 2020
1 parent f8a8b0f commit 76dde48
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d8e81ff9b9be0c66a68980621c2ceb3b079130bb Mon Sep 17 00:00:00 2001
From cb4fb27496bed1ff61d3207fbc51973576c11d12 Mon Sep 17 00:00:00 2001
From: Pankaj Maharana <pankaj.maharana@lge.com>
Date: Wed, 8 Aug 2018 12:01:02 +0530
Subject: [PATCH] fix adaptive resolution change in seek issue
Expand Down Expand Up @@ -29,7 +29,7 @@ Upstream-Status: Inappropriate
2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index dc39c4c..e54e83a 100644
index ee41fa9..c4c166d 100644
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -88,6 +88,7 @@ enum
Expand Down Expand Up @@ -92,7 +92,7 @@ index dc39c4c..e54e83a 100644
element_class->change_state =
GST_DEBUG_FUNCPTR (gst_omx_video_dec_change_state);

@@ -2786,15 +2792,17 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder,
@@ -2795,15 +2801,17 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder,
}

if (needs_disable && is_format_change) {
Expand All @@ -112,9 +112,9 @@ index dc39c4c..e54e83a 100644

+skip_disable:
port_def.format.video.nFrameWidth = info->width;
port_def.format.video.nFrameHeight = GST_VIDEO_INFO_FIELD_HEIGHT (info);
port_def.format.video.xFramerate = framerate_q16;
@@ -2984,7 +2992,8 @@ gst_omx_video_dec_handle_frame (GstVideoDecoder * decoder,
port_def.format.video.nFrameHeight = GST_VIDEO_INFO_HEIGHT (info);
/*We cannot use GST_VIDEO_INFO_FIELD_HEIGHT() as encoded content may use either
@@ -2999,7 +3007,8 @@ gst_omx_video_dec_handle_frame (GstVideoDecoder * decoder,
return GST_FLOW_OK;
}

Expand All @@ -124,7 +124,7 @@ index dc39c4c..e54e83a 100644
if (!gst_omx_video_dec_enable (self, frame->input_buffer))
goto enable_error;
}
@@ -3297,9 +3306,16 @@ release_error:
@@ -3312,9 +3321,16 @@ release_error:
static GstFlowReturn
gst_omx_video_dec_drain (GstVideoDecoder * decoder)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 06988b1e2c29937fbcc4a85f6693e1b0e8726682 Mon Sep 17 00:00:00 2001
From a0f0d71c80cb77c7fca5660f28ad49067405de7d Mon Sep 17 00:00:00 2001
From: "divvya.rosna" <divvya.rosna@lge.com>
Date: Thu, 13 Aug 2020 05:42:37 +0000
Subject: [PATCH] rpi : mesa=webosrpi3 webruntime=webosrpi6
Expand Down

0 comments on commit 76dde48

Please sign in to comment.