From 19f3dbb0e175f16d039d43c5dea46fb162e57b5e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 8 Oct 2012 09:51:39 -0300 Subject: imx-lib: Make patch files specific for 11.09.01 version Change-Id: Ieab6a5423e7f66a8e776656f1376669f4c5b9d39 Signed-off-by: Otavio Salvador --- ...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 | 2 +- ...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_11.09.01.bb | 6 ++-- 6 files changed, 71 insertions(+), 71 deletions(-) create mode 100644 recipes-multimedia/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch create 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/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch delete mode 100644 recipes-multimedia/imx-lib/imx-lib/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch 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 new file mode 100644 index 0000000..4fa3d8b --- /dev/null +++ b/recipes-multimedia/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch @@ -0,0 +1,31 @@ +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 new file mode 100644 index 0000000..1183b29 --- /dev/null +++ b/recipes-multimedia/imx-lib/imx-lib-11.09.01/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch @@ -0,0 +1,36 @@ +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 index 83ad990..6832048 100644 --- a/recipes-multimedia/imx-lib/imx-lib.inc +++ b/recipes-multimedia/imx-lib/imx-lib.inc @@ -24,7 +24,7 @@ do_compile () { } do_install () { - oe_runmake DEST_DIR="${D}" install + oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install } FILES_${PN} += "${libdir}/*${SOLIBS}" 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 deleted file mode 100644 index 4fa3d8b..0000000 --- a/recipes-multimedia/imx-lib/imx-lib/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/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 deleted file mode 100644 index 1183b29..0000000 --- a/recipes-multimedia/imx-lib/imx-lib/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_11.09.01.bb b/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb index 95cc021..b041918 100644 --- a/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb +++ b/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb @@ -1,10 +1,10 @@ include imx-lib.inc -PR = "${INC_PR}.1" - -COMPATIBLE_MACHINE = "(mx5)" +PR = "${INC_PR}.2" 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" + +COMPATIBLE_MACHINE = "(mx5)" -- cgit v1.2.3-54-g00ecf