commit 601b38d3c53653270c16292489e8c28945582dae
author Andreas Huber <andih@google.com> Wed Mar 17 12:53:22 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 17 12:53:22 2010 -0700
tree d5690ed93cb710f0cc150f24228fa480bd145491
parent d3f93c572e55dc902d01f8eeda1d107a8b9128e2
parent c9915aed58b3846251406b337ba2e1813d71f07e

Merge "Instead of asserting that nothing bad happened during (software-)AAC decoding, return a runtime error if appropriate."

media/libstagefright/codecs/aacdec/AACDecoder.cpp

diff --git a/media/libstagefright/codecs/aacdec/AACDecoder.cpp b/media/libstagefright/codecs/aacdec/AACDecoder.cpp
index f0b66c9..fe84b38 100644
--- a/media/libstagefright/codecs/aacdec/AACDecoder.cpp
+++ b/media/libstagefright/codecs/aacdec/AACDecoder.cpp
@@ -199,7 +199,16 @@
     mConfig->pOutputBuffer_plus = NULL;
     mConfig->repositionFlag = false;
 
-    CHECK_EQ(PVMP4AudioDecodeFrame(mConfig, mDecoderBuf), MP4AUDEC_SUCCESS);
+    Int decoderErr = PVMP4AudioDecodeFrame(mConfig, mDecoderBuf);
+
+    if (decoderErr != MP4AUDEC_SUCCESS) {
+        LOGE("AAC decoder returned error %d", decoderErr);
+
+        buffer->release();
+        buffer = NULL;
+
+        return ERROR_MALFORMED;
+    }
 
     buffer->set_range(
             0, mConfig->frameLength * sizeof(int16_t) * mConfig->desiredChannels);