diff options
4 files changed, 8 insertions, 79 deletions
diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch deleted file mode 100644 index 4fa3d8be2..000000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 3bca9e128dd82e69f877e90c1bcd614c48a75161 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Sammy He <r62914@freescale.com> | ||
| 3 | Date: Thu, 15 Sep 2011 22:40:10 +0800 | ||
| 4 | Subject: [PATCH 1/3] ENGR00156800 vpu: Fix decoding mp4PackedPBFrame stream failure issue | ||
| 5 | |||
| 6 | Decoding the stream with mp4PackedPBFrame is failure due to write | ||
| 7 | point in bitstream set wrong. | ||
| 8 | This patch will fix it. | ||
| 9 | |||
| 10 | Signed-off-by: Sammy He <r62914@freescale.com> | ||
| 11 | --- | ||
| 12 | vpu/vpu_lib.c | 3 +++ | ||
| 13 | 1 files changed, 3 insertions(+), 0 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c | ||
| 16 | index a5522fa..32d44b2 100644 | ||
| 17 | --- a/vpu/vpu_lib.c | ||
| 18 | +++ b/vpu/vpu_lib.c | ||
| 19 | @@ -3552,6 +3552,9 @@ RetCode vpu_DecGetOutputInfo(DecHandle handle, DecOutputInfo * info) | ||
| 20 | info->notSufficientSliceBuffer = (val >> 2) & 0x1; | ||
| 21 | } else if (pCodecInst->codecMode == MP4_DEC) { | ||
| 22 | info->mp4PackedPBframe = ((val >> 16) & 0x01); | ||
| 23 | + /* Need to backup WR_PTR for mp4PackedPBframe */ | ||
| 24 | + if (info->mp4PackedPBframe) | ||
| 25 | + pCodecInst->ctxRegs[CTX_BIT_WR_PTR] = VpuReadReg(BIT_WR_PTR); | ||
| 26 | } | ||
| 27 | |||
| 28 | val = VpuReadReg(RET_DEC_PIC_SIZE); /* decoding picture size */ | ||
| 29 | -- | ||
| 30 | 1.7.1 | ||
| 31 | |||
diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch deleted file mode 100644 index 1183b29dc..000000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From 57e5a741c5bef4ac5afd820979a93808ecc97c64 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Sammy He <r62914@freescale.com> | ||
| 3 | Date: Mon, 21 Nov 2011 23:08:18 +0800 | ||
| 4 | Subject: [PATCH 2/3] ENGR00162690 vpu: Fix the issue of rotation 180 degree in encoder | ||
| 5 | |||
| 6 | There may be mosaic if rotation is 180 degree in vpu encoder on mx5. | ||
| 7 | This patch fixed it, same solution is applied to mx6 platform. | ||
| 8 | |||
| 9 | Signed-off-by: Sammy He <r62914@freescale.com> | ||
| 10 | --- | ||
| 11 | vpu/vpu_lib.c | 2 -- | ||
| 12 | 1 files changed, 0 insertions(+), 2 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c | ||
| 15 | index 32d44b2..0fcf5d5 100644 | ||
| 16 | --- a/vpu/vpu_lib.c | ||
| 17 | +++ b/vpu/vpu_lib.c | ||
| 18 | @@ -1306,7 +1306,6 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param) | ||
| 19 | return RETCODE_FAILURE_TIMEOUT; | ||
| 20 | |||
| 21 | if (pEncInfo->rotationEnable) { | ||
| 22 | - rotMirEnable = 0x10; /* Enable rotator */ | ||
| 23 | switch (pEncInfo->rotationAngle) { | ||
| 24 | case 0: | ||
| 25 | rotMirMode |= 0x0; | ||
| 26 | @@ -1326,7 +1325,6 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param) | ||
| 27 | } | ||
| 28 | } | ||
| 29 | if (pEncInfo->mirrorEnable) { | ||
| 30 | - rotMirEnable = 0x10; /* Enable mirror */ | ||
| 31 | switch (pEncInfo->mirrorDirection) { | ||
| 32 | case MIRDIR_NONE: | ||
| 33 | rotMirMode |= 0x0; | ||
| 34 | -- | ||
| 35 | 1.7.1 | ||
| 36 | |||
diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.01.bb b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.01.bb deleted file mode 100644 index 37e66281f..000000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.01.bb +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | include imx-lib.inc | ||
| 2 | |||
| 3 | PR = "r5.2" | ||
| 4 | |||
| 5 | SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz" | ||
| 6 | |||
| 7 | SRC_URI += " file://0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch \ | ||
| 8 | file://0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch" | ||
| 9 | SRC_URI[md5sum] = "45574f8f32f7000ca11d585fa60dea8c" | ||
| 10 | SRC_URI[sha256sum] = "f151a8bb3099b596b5834a1139c19e526802e6a0aa965018d16375e7e1f48f27" | ||
| 11 | |||
| 12 | COMPATIBLE_MACHINE = "(mx5)" | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.02.bb b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.02.bb new file mode 100644 index 000000000..07c6e350e --- /dev/null +++ b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.02.bb | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | # Copyright (C) 2013 Freescale Semiconductor | ||
| 2 | require imx-lib.inc | ||
| 3 | |||
| 4 | SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz" | ||
| 5 | SRC_URI[md5sum] = "a4e7447e35cfac0b966a51f001390d6e" | ||
| 6 | SRC_URI[sha256sum] = "3ed082005789db0c9c41e14073417319f4e23f5646a7d21f34840470f4328bd5" | ||
| 7 | |||
| 8 | COMPATIBLE_MACHINE = "(mx5)" | ||
