commit b4ec8d0558c78b94ec7bf09018a7bf653cfca525
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri Oct 02 15:37:47 2015 +0530
committer Marco Nelissen <marcone@google.com> Fri Oct 16 20:21:33 2015 +0000
tree 806361a260af3d38d80e7db7da100e58a1d2a0f9
parent a3f29527044ad61ae8e38b93ab9355a20c5fd2c0

SoftAVCDec: Added a check for unsupported resolutions

Bug: 24542936

Change-Id: I97203353c7d026e02c8aad0f2c820a641e453c7c

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

diff --git a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
index 7c5093e..8101f75 100644
--- a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
+++ b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
@@ -582,6 +582,17 @@
             IV_API_CALL_STATUS_T status;
             status = ivdec_api_function(mCodecCtx, (void *)&s_dec_ip, (void *)&s_dec_op);
 
+            bool unsupportedResolution =
+                (IVD_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED == (s_dec_op.u4_error_code & 0xFF));
+
+            /* Check for unsupported dimensions */
+            if (unsupportedResolution) {
+                ALOGE("Unsupported resolution : %dx%d", mWidth, mHeight);
+                notify(OMX_EventError, OMX_ErrorUnsupportedSetting, 0, NULL);
+                mSignalledError = true;
+                return;
+            }
+
             bool resChanged = (IVD_RES_CHANGED == (s_dec_op.u4_error_code & 0xFF));
 
             GETTIME(&mTimeEnd, NULL);