imx-lib: Merge patches from Linux_20201112_20patch_bundle.tar.gz

ENGR00156800 VPU: Fix decoding mp4PackedPBFrame stream failure issue
ENGR00162690 VPU: Fix the issue of rotation 180 degree in encoder

Signed-off-by: Leon Woestenberg <leon@sidebranch.com>

diff --git a/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch
new file mode 100644 (file)
index 0000000..4fa3d8b
--- /dev/null
+++ b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch
@@ -0,0 +1,31 @@
+From 3bca9e128dd82e69f877e90c1bcd614c48a75161 Mon Sep 17 00:00:00 2001
+From: Sammy He <r62914@freescale.com>
+Date: Thu, 15 Sep 2011 22:40:10 +0800
+Subject: [PATCH 1/3] ENGR00156800 vpu: Fix decoding mp4PackedPBFrame stream failure issue
+
+Decoding the stream with mp4PackedPBFrame is failure due to write
+point in bitstream set wrong.
+This patch will fix it.
+
+Signed-off-by: Sammy He <r62914@freescale.com>
+---
+ vpu/vpu_lib.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c
+index a5522fa..32d44b2 100644
+--- a/vpu/vpu_lib.c
++++ b/vpu/vpu_lib.c
+@@ -3552,6 +3552,9 @@ RetCode vpu_DecGetOutputInfo(DecHandle handle, DecOutputInfo * info)
+               info->notSufficientSliceBuffer = (val >> 2) & 0x1;
+       } else if (pCodecInst->codecMode == MP4_DEC) {
+               info->mp4PackedPBframe = ((val >> 16) & 0x01);
++              /* Need to backup WR_PTR for mp4PackedPBframe */
++              if (info->mp4PackedPBframe)
++                      pCodecInst->ctxRegs[CTX_BIT_WR_PTR] = VpuReadReg(BIT_WR_PTR);
+       }
+ 
+       val = VpuReadReg(RET_DEC_PIC_SIZE);     /* decoding picture size */
+-- 
+1.7.1
+

diff --git a/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch
new file mode 100644 (file)
index 0000000..1183b29
--- /dev/null
+++ b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch
@@ -0,0 +1,36 @@
+From 57e5a741c5bef4ac5afd820979a93808ecc97c64 Mon Sep 17 00:00:00 2001
+From: Sammy He <r62914@freescale.com>
+Date: Mon, 21 Nov 2011 23:08:18 +0800
+Subject: [PATCH 2/3] ENGR00162690 vpu: Fix the issue of rotation 180 degree in encoder
+
+There may be mosaic if rotation is 180 degree in vpu encoder on mx5.
+This patch fixed it, same solution is applied to mx6 platform.
+
+Signed-off-by: Sammy He <r62914@freescale.com>
+---
+ vpu/vpu_lib.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c
+index 32d44b2..0fcf5d5 100644
+--- a/vpu/vpu_lib.c
++++ b/vpu/vpu_lib.c
+@@ -1306,7 +1306,6 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param)
+               return RETCODE_FAILURE_TIMEOUT;
+ 
+       if (pEncInfo->rotationEnable) {
+-              rotMirEnable = 0x10;    /* Enable rotator */
+               switch (pEncInfo->rotationAngle) {
+               case 0:
+                       rotMirMode |= 0x0;
+@@ -1326,7 +1325,6 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param)
+               }
+       }
+       if (pEncInfo->mirrorEnable) {
+-              rotMirEnable = 0x10;    /* Enable mirror */
+               switch (pEncInfo->mirrorDirection) {
+               case MIRDIR_NONE:
+                       rotMirMode |= 0x0;
+-- 
+1.7.1
+

diff --git a/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
index 4512c152b4fee2a81bcddd093226aed449c36df5..5cfab671c0e585507d296934aacfa2cad491bb07 100644 (file)
--- a/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
+++ b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
@@ -5,12 +5,14 @@ DESCRIPTION = "Platform specific libraries for imx platform"
 LICENSE = "LGPL"
 SECTION = "multimedia"
 DEPENDS = "virtual/kernel"
-PR = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e"
 
 SRC_URI = "file://${PN}-${PV}.tar.gz \
-           file://imx-lib-remove-shared-libs-symlinks.patch"
+           file://imx-lib-remove-shared-libs-symlinks.patch \
+           file://0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch \
+           file://0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch"
 SRC_URI[md5sum] = "45574f8f32f7000ca11d585fa60dea8c"
 SRC_URI[sha256sum] = "f151a8bb3099b596b5834a1139c19e526802e6a0aa965018d16375e7e1f48f27"