diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-19 22:18:28 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-24 14:32:53 -0300 |
commit | 1920dc5374f8e3281aa38e43befaea3ff000127a (patch) | |
tree | 444d4cce66fb3ecd6c3f5b05a2dea35626f37482 /recipes-multimedia/imx-lib | |
parent | 64e94efb9ca247e854f73932c6f6353c1a8c6b1e (diff) | |
download | meta-fsl-arm-1920dc5374f8e3281aa38e43befaea3ff000127a.tar.gz |
imx-lib: Move to 'recipes-multimedia' root directory
The 'imx-lib' is used by different recipes and is not a fsl-mm-core
package only so we move it to root directory of 'recipes-multimedia'.
Change-Id: I11364b6620b1807f28a2cfd94e1507c9f9bfca30
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Daiane Angolini <daiane.angolini@freescale.com>
Diffstat (limited to 'recipes-multimedia/imx-lib')
5 files changed, 110 insertions, 0 deletions
diff --git a/recipes-multimedia/imx-lib/imx-lib.inc b/recipes-multimedia/imx-lib/imx-lib.inc new file mode 100644 index 0000000..554df15 --- /dev/null +++ b/recipes-multimedia/imx-lib/imx-lib.inc | |||
@@ -0,0 +1,33 @@ | |||
1 | # Copyright (C) 2012 Freescale Semiconductor | ||
2 | |||
3 | DESCRIPTION = "Platform specific libraries for imx platform" | ||
4 | LICENSE = "LGPLv2.1" | ||
5 | SECTION = "multimedia" | ||
6 | DEPENDS = "virtual/kernel" | ||
7 | |||
8 | INC_PR = "r2" | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e" | ||
11 | |||
12 | SRC_URI = "file://${PN}-${PV}.tar.gz" | ||
13 | |||
14 | PLATFORM_mx5 = "IMX51" | ||
15 | |||
16 | PARALLEL_MAKE="-j 1" | ||
17 | EXTRA_OEMAKE = "" | ||
18 | |||
19 | do_compile () { | ||
20 | INCLUDE_DIR="-I${STAGING_INCDIR} -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \ | ||
21 | -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include \ | ||
22 | -I${STAGING_KERNEL_DIR}/include" | ||
23 | oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all | ||
24 | } | ||
25 | |||
26 | do_install () { | ||
27 | oe_runmake DEST_DIR="${D}" install | ||
28 | } | ||
29 | |||
30 | FILES_${PN} += "${libdir}/*${SOLIBS}" | ||
31 | FILES_${PN}-dbg += "${libdir}/.debug" | ||
32 | FILES_${PN}-dev += "${libdir}/*${SOLIBSDEV}" | ||
33 | |||
diff --git a/recipes-multimedia/imx-lib/imx-lib/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch b/recipes-multimedia/imx-lib/imx-lib/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch new file mode 100644 index 0000000..4fa3d8b --- /dev/null +++ b/recipes-multimedia/imx-lib/imx-lib/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch | |||
@@ -0,0 +1,31 @@ | |||
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/recipes-multimedia/imx-lib/imx-lib/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch b/recipes-multimedia/imx-lib/imx-lib/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch new file mode 100644 index 0000000..1183b29 --- /dev/null +++ b/recipes-multimedia/imx-lib/imx-lib/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch | |||
@@ -0,0 +1,36 @@ | |||
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/recipes-multimedia/imx-lib/imx-lib/imx-lib-11.09.01.tar.gz b/recipes-multimedia/imx-lib/imx-lib/imx-lib-11.09.01.tar.gz new file mode 100644 index 0000000..1d22276 --- /dev/null +++ b/recipes-multimedia/imx-lib/imx-lib/imx-lib-11.09.01.tar.gz | |||
Binary files differ | |||
diff --git a/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb b/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb new file mode 100644 index 0000000..95cc021 --- /dev/null +++ b/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | include imx-lib.inc | ||
2 | |||
3 | PR = "${INC_PR}.1" | ||
4 | |||
5 | COMPATIBLE_MACHINE = "(mx5)" | ||
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" | ||