diff options
author | Andreas Huber <andih@google.com> | 2011-05-04 13:18:36 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-04 13:18:36 -0700 |
commit | 4be6932bd94cd98ba2cfad863cef414727578435 (patch) | |
tree | 6d90ffc1b55cfc5e37074b27c144a05f64173005 | |
parent | 37db3f9784eb05f21c1f230e540bebf46748139a (diff) | |
parent | 59633a1e0ae968a90367718fb21716c32d73af04 (diff) | |
download | frameworks_av-4be6932bd94cd98ba2cfad863cef414727578435.zip frameworks_av-4be6932bd94cd98ba2cfad863cef414727578435.tar.gz frameworks_av-4be6932bd94cd98ba2cfad863cef414727578435.tar.bz2 |
Merge "Signal an error if aac decoding fails early."
-rw-r--r-- | media/libstagefright/codecs/aacdec/AACDecoder.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/aacdec/AACDecoder.cpp b/media/libstagefright/codecs/aacdec/AACDecoder.cpp index 208431c..d2e3eaa 100644 --- a/media/libstagefright/codecs/aacdec/AACDecoder.cpp +++ b/media/libstagefright/codecs/aacdec/AACDecoder.cpp @@ -234,6 +234,23 @@ status_t AACDecoder::read( mConfig->aacPlusUpsamplingFactor, mConfig->desiredChannels); CHECK(mNumDecodedBuffers > 0); + + if (decoderErr != MP4AUDEC_SUCCESS) { + // If decoding fails this early, the fields in mConfig may + // not be valid and we cannot recover. + + LOGE("Unable to decode aac content, decoder returned error %d", + decoderErr); + + buffer->release(); + buffer = NULL; + + mInputBuffer->release(); + mInputBuffer = NULL; + + return ERROR_UNSUPPORTED; + } + if (mNumDecodedBuffers == 1) { mUpsamplingFactor = mConfig->aacPlusUpsamplingFactor; // Check on the sampling rate to see whether it is changed. |