commit 5bf00e8858de16b294174c35b338b99b5a3259fb
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Aug 06 23:41:19 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 06 23:41:19 2018 -0700
tree 621904eb384533df1bddd47a000d0f3687849be1
parent 89bbe9e07c48fe5036a44b51951fe3b44ab4ac8f
parent 34e09e4a72525b05605b5f466a0e6860ba27a9f2

Merge "SoftXaac: Handle error cases when decoder fails to initialize" into pi-dev am: b9e822981c
am: 34e09e4a72

Change-Id: Ic5c4ebdc90567746a8bfec6d607c26d2fb7f6185

media/libstagefright/codecs/xaacdec/SoftXAAC.cpp

diff --git a/media/libstagefright/codecs/xaacdec/SoftXAAC.cpp b/media/libstagefright/codecs/xaacdec/SoftXAAC.cpp
index f173e0f..06b15b3 100644
--- a/media/libstagefright/codecs/xaacdec/SoftXAAC.cpp
+++ b/media/libstagefright/codecs/xaacdec/SoftXAAC.cpp
@@ -689,7 +689,6 @@
                     notify(OMX_EventError, OMX_ErrorUndefined, err_code, NULL);
                     return;
                 }
-                mIsCodecConfigFlushRequired = true;
             }
 
             if (!mSampFreq || !mNumChannels) {
@@ -713,10 +712,14 @@
             signed int bytesConsumed = 0;
             int errorCode = 0;
             if (mIsCodecInitialized) {
+                mIsCodecConfigFlushRequired = true;
                 errorCode =
                     decodeXAACStream(inBuffer, inBufferLength, &bytesConsumed, &numOutBytes);
-            } else {
+            } else if (!mIsCodecConfigFlushRequired) {
                 ALOGW("Assumption that first frame after header initializes decoder failed!");
+                mSignalledError = true;
+                notify(OMX_EventError, OMX_ErrorUndefined, -1, NULL);
+                return;
             }
             inHeader->nFilledLen -= bytesConsumed;
             inHeader->nOffset += bytesConsumed;