summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDheeraj CVR <cvr.dheeraj@gmail.com>2013-06-29 04:12:48 +0530
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-07-03 13:15:01 -0700
commit78e8d9f6068a8644f5bd19a46786d0bda0e8eeab (patch)
treee5a1c4c710d4a0a858dd3ef1105e2d661c221886
parent01d0bd2f8291089cb729b19d5931e1352bf31078 (diff)
downloadframeworks_av-78e8d9f6068a8644f5bd19a46786d0bda0e8eeab.zip
frameworks_av-78e8d9f6068a8644f5bd19a46786d0bda0e8eeab.tar.gz
frameworks_av-78e8d9f6068a8644f5bd19a46786d0bda0e8eeab.tar.bz2
libstagefright: [Reworked] Fix incorrectness nPortIndex value for QueryCodec
http://review.cyanogenmod.org/#/c/32358/ was intended to fix issues with OMX Components failing on ME722 (OMAP3). This patch was working fine on OMAP3 devices and was required to fix issues DSP MMU FAULTS. It has been reverted with patch http://review.cyanogenmod.org/44486 which again broke OMX on OMAP3. Implement a Workaround for OMAP using OMAP_ENHANCEMENT Log for this issue observed on P970 (OMAP3) during Gallery Thumbnail Generation: http://pastebin.com/qRTpm7RN DmmMap():1600 DSPProcessor_ReserveMemory() failed - error 0xfffffffb Change-Id: Ifd0c784e354c6c00401686cc0f2188842df9496c
-rw-r--r--media/libstagefright/OMXCodec.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index efb5f26..91ba093 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -5432,7 +5432,11 @@ status_t QueryCodec(
// Color format query
OMX_VIDEO_PARAM_PORTFORMATTYPE portFormat;
InitOMXParams(&portFormat);
+#ifdef OMAP_ENHANCEMENT
+ portFormat.nPortIndex = !isEncoder ? 0 : 1;
+#else
portFormat.nPortIndex = !isEncoder ? 1 : 0;
+#endif
for (OMX_U32 index = 0;;index++) {
portFormat.nIndex = index;
err = omx->getParameter(