summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiane Angolini <daiane.angolini@freescale.com>2013-09-26 09:31:23 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2013-10-18 00:01:38 -0300
commit8ece03524cf63e1d81757353a65b450348b55591 (patch)
treef3d35d15aade993b7b5252d9024167249158919b
parent550a63b89e39e6f54699e030fe455482ecf96c06 (diff)
downloadmeta-fsl-arm-8ece03524cf63e1d81757353a65b450348b55591.tar.gz
imx-lib: Move from 11.09.01 to 11.09.02
The lib-vpu must be remove from imx-lib package due to a license conflict. Beside that a list of patches was included over 11.09.01: * ENGR00277379 yocto: Makefile changes to build on Yocto * ENGR00272020 Add EULA.txt to VPU lib directory * ENGR00215182 HDMI CEC:Add Makefile of hdmi-cec lib * ENGR00234665 Enable pxp library building * ENGR00230334: Fix for GCC 4.6 toolchain and build warnings * ENGR00221837-2 ipu lib: only build for i.MX5 platform * ENGR00179726-2 Add VDOA V4L support to VPU unit test * ENGR00177165: Fix build error of missing videodev.h * ENGR00174611: Configured ePxP lib for MX6 * ENGR00170744 IPU lib:Control interface supports allocating pmem buf * ENGR00170632 IPU lib:Allocate pmem buf for rotation buf * ENGR00170455 IPU lib:Change head file for flash Change-Id: I034f22535d78edfce08519eead0310b2a8b4e4a0 Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
-rw-r--r--recipes-bsp/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch31
-rw-r--r--recipes-bsp/imx-lib/imx-lib-11.09.01/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch36
-rw-r--r--recipes-bsp/imx-lib/imx-lib_11.09.01.bb12
-rw-r--r--recipes-bsp/imx-lib/imx-lib_11.09.02.bb8
4 files changed, 8 insertions, 79 deletions
diff --git a/recipes-bsp/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch b/recipes-bsp/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch
deleted file mode 100644
index 4fa3d8b..0000000
--- a/recipes-bsp/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 3bca9e128dd82e69f877e90c1bcd614c48a75161 Mon Sep 17 00:00:00 2001
2From: Sammy He <r62914@freescale.com>
3Date: Thu, 15 Sep 2011 22:40:10 +0800
4Subject: [PATCH 1/3] ENGR00156800 vpu: Fix decoding mp4PackedPBFrame stream failure issue
5
6Decoding the stream with mp4PackedPBFrame is failure due to write
7point in bitstream set wrong.
8This patch will fix it.
9
10Signed-off-by: Sammy He <r62914@freescale.com>
11---
12 vpu/vpu_lib.c | 3 +++
13 1 files changed, 3 insertions(+), 0 deletions(-)
14
15diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c
16index 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--
301.7.1
31
diff --git a/recipes-bsp/imx-lib/imx-lib-11.09.01/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch b/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 1183b29..0000000
--- a/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 @@
1From 57e5a741c5bef4ac5afd820979a93808ecc97c64 Mon Sep 17 00:00:00 2001
2From: Sammy He <r62914@freescale.com>
3Date: Mon, 21 Nov 2011 23:08:18 +0800
4Subject: [PATCH 2/3] ENGR00162690 vpu: Fix the issue of rotation 180 degree in encoder
5
6There may be mosaic if rotation is 180 degree in vpu encoder on mx5.
7This patch fixed it, same solution is applied to mx6 platform.
8
9Signed-off-by: Sammy He <r62914@freescale.com>
10---
11 vpu/vpu_lib.c | 2 --
12 1 files changed, 0 insertions(+), 2 deletions(-)
13
14diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c
15index 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--
351.7.1
36
diff --git a/recipes-bsp/imx-lib/imx-lib_11.09.01.bb b/recipes-bsp/imx-lib/imx-lib_11.09.01.bb
deleted file mode 100644
index 37e6628..0000000
--- a/recipes-bsp/imx-lib/imx-lib_11.09.01.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1include imx-lib.inc
2
3PR = "r5.2"
4
5SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz"
6
7SRC_URI += " file://0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch \
8 file://0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch"
9SRC_URI[md5sum] = "45574f8f32f7000ca11d585fa60dea8c"
10SRC_URI[sha256sum] = "f151a8bb3099b596b5834a1139c19e526802e6a0aa965018d16375e7e1f48f27"
11
12COMPATIBLE_MACHINE = "(mx5)"
diff --git a/recipes-bsp/imx-lib/imx-lib_11.09.02.bb b/recipes-bsp/imx-lib/imx-lib_11.09.02.bb
new file mode 100644
index 0000000..07c6e35
--- /dev/null
+++ b/recipes-bsp/imx-lib/imx-lib_11.09.02.bb
@@ -0,0 +1,8 @@
1# Copyright (C) 2013 Freescale Semiconductor
2require imx-lib.inc
3
4SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz"
5SRC_URI[md5sum] = "a4e7447e35cfac0b966a51f001390d6e"
6SRC_URI[sha256sum] = "3ed082005789db0c9c41e14073417319f4e23f5646a7d21f34840470f4328bd5"
7
8COMPATIBLE_MACHINE = "(mx5)"