diff options
author | Daiane Angolini <daiane.angolini@freescale.com> | 2013-05-16 12:27:16 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-05-28 11:00:50 -0300 |
commit | 4ca8d4d347af36a1d42086cf15e314888e3e09fe (patch) | |
tree | aba06de2abb86f55f4c6c2be79728d0a76fe2f51 /recipes-multimedia/imx-lib | |
parent | 91e98ccd484c8de0bd33ecbec4416af094eec3cb (diff) | |
download | meta-fsl-arm-4ca8d4d347af36a1d42086cf15e314888e3e09fe.tar.gz |
imx-lib: Move it to recipe-bsp dir
imx-lib is not a multimedia application. It provides
others libs not related with multimedia, so it should
go to recipes-bsp dir.
Change-Id: Ie2f2adba2e155d780ce4436fc308277961a66769
Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
Diffstat (limited to 'recipes-multimedia/imx-lib')
5 files changed, 0 insertions, 131 deletions
diff --git a/recipes-multimedia/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch b/recipes-multimedia/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch deleted file mode 100644 index 4fa3d8b..0000000 --- a/recipes-multimedia/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/recipes-multimedia/imx-lib/imx-lib-11.09.01/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch b/recipes-multimedia/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-multimedia/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/recipes-multimedia/imx-lib/imx-lib.inc b/recipes-multimedia/imx-lib/imx-lib.inc deleted file mode 100644 index 24477ce..0000000 --- a/recipes-multimedia/imx-lib/imx-lib.inc +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
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 = "r5" | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e" | ||
11 | |||
12 | inherit fsl-eula-unpack | ||
13 | |||
14 | PLATFORM_mx6 = "IMX6Q" | ||
15 | PLATFORM_mx5 = "IMX51" | ||
16 | |||
17 | PARALLEL_MAKE="-j 1" | ||
18 | EXTRA_OEMAKE = "" | ||
19 | |||
20 | do_configure_append () { | ||
21 | # FIXME: The build system does not allow CC and AR to be overriden | ||
22 | find ${S} -name Makefile | xargs sed -i 's,^\(CC\|AR\)=,\1 ?=,g' | ||
23 | } | ||
24 | |||
25 | do_compile () { | ||
26 | INCLUDE_DIR="-I${STAGING_INCDIR} -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \ | ||
27 | -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include \ | ||
28 | -I${STAGING_KERNEL_DIR}/include" | ||
29 | oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all | ||
30 | } | ||
31 | |||
32 | do_install () { | ||
33 | oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install | ||
34 | } | ||
35 | |||
36 | FILES_${PN} += "${libdir}/*${SOLIBS}" | ||
37 | FILES_${PN}-dbg += "${libdir}/.debug" | ||
38 | FILES_${PN}-dev += "${libdir}/*${SOLIBSDEV}" | ||
39 | |||
diff --git a/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb b/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb deleted file mode 100644 index 0ed5388..0000000 --- a/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | include imx-lib.inc | ||
2 | |||
3 | PR = "${INC_PR}.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 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
13 | COMPATIBLE_MACHINE = "(mx5)" | ||
diff --git a/recipes-multimedia/imx-lib/imx-lib_3.0.35-4.0.0.bb b/recipes-multimedia/imx-lib/imx-lib_3.0.35-4.0.0.bb deleted file mode 100644 index 5420cd6..0000000 --- a/recipes-multimedia/imx-lib/imx-lib_3.0.35-4.0.0.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | include imx-lib.inc | ||
2 | |||
3 | PR = "${INC_PR}.0" | ||
4 | PE = "1" | ||
5 | |||
6 | SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.bin;fsl-eula=true" | ||
7 | |||
8 | SRC_URI[md5sum] = "f0f9b0a7a7d558edfe624190a8860122" | ||
9 | SRC_URI[sha256sum] = "90caafc7a8898fc3126779eacec14fac2453afdaa45ddc7063ccd059dede97ce" | ||
10 | |||
11 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
12 | COMPATIBLE_MACHINE = "(mx6)" | ||