From 4ca8d4d347af36a1d42086cf15e314888e3e09fe Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Thu, 16 May 2013 12:27:16 -0300 Subject: 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 --- ...0-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch | 31 ----------------- ...0-vpu-Fix-the-issue-of-rotation-180-degre.patch | 36 -------------------- recipes-multimedia/imx-lib/imx-lib.inc | 39 ---------------------- recipes-multimedia/imx-lib/imx-lib_11.09.01.bb | 13 -------- recipes-multimedia/imx-lib/imx-lib_3.0.35-4.0.0.bb | 12 ------- 5 files changed, 131 deletions(-) delete mode 100644 recipes-multimedia/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch delete mode 100644 recipes-multimedia/imx-lib/imx-lib-11.09.01/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch delete mode 100644 recipes-multimedia/imx-lib/imx-lib.inc delete mode 100644 recipes-multimedia/imx-lib/imx-lib_11.09.01.bb delete mode 100644 recipes-multimedia/imx-lib/imx-lib_3.0.35-4.0.0.bb (limited to 'recipes-multimedia/imx-lib') 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 @@ -From 3bca9e128dd82e69f877e90c1bcd614c48a75161 Mon Sep 17 00:00:00 2001 -From: Sammy He -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 ---- - 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/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 @@ -From 57e5a741c5bef4ac5afd820979a93808ecc97c64 Mon Sep 17 00:00:00 2001 -From: Sammy He -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 ---- - 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/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 @@ -# Copyright (C) 2012 Freescale Semiconductor - -DESCRIPTION = "Platform specific libraries for imx platform" -LICENSE = "LGPLv2.1" -SECTION = "multimedia" -DEPENDS = "virtual/kernel" - -INC_PR = "r5" - -LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e" - -inherit fsl-eula-unpack - -PLATFORM_mx6 = "IMX6Q" -PLATFORM_mx5 = "IMX51" - -PARALLEL_MAKE="-j 1" -EXTRA_OEMAKE = "" - -do_configure_append () { - # FIXME: The build system does not allow CC and AR to be overriden - find ${S} -name Makefile | xargs sed -i 's,^\(CC\|AR\)=,\1 ?=,g' -} - -do_compile () { - INCLUDE_DIR="-I${STAGING_INCDIR} -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \ - -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include \ - -I${STAGING_KERNEL_DIR}/include" - oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all -} - -do_install () { - oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install -} - -FILES_${PN} += "${libdir}/*${SOLIBS}" -FILES_${PN}-dbg += "${libdir}/.debug" -FILES_${PN}-dev += "${libdir}/*${SOLIBSDEV}" - 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 @@ -include imx-lib.inc - -PR = "${INC_PR}.2" - -SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz" - -SRC_URI += " 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" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -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 @@ -include imx-lib.inc - -PR = "${INC_PR}.0" -PE = "1" - -SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "f0f9b0a7a7d558edfe624190a8860122" -SRC_URI[sha256sum] = "90caafc7a8898fc3126779eacec14fac2453afdaa45ddc7063ccd059dede97ce" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mx6)" -- cgit v1.2.3-54-g00ecf