Merge "Restore legacy soft-aac decoder behaviour. Substitute silence on decode error."

2011-06-21 08:36:51 -07:00
parent 827de09e89 dabf22181d
commit e2b801e5a4
1 changed files with 8 additions and 0 deletions
--- a/media/libstagefright/codecs/aacdec/SoftAAC.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC.cpp
@@ -367,7 +367,15 @@ void SoftAAC::onQueueFilled(OMX_U32 portIndex) {
            inHeader->nFilledLen -= mConfig->inputBufferUsedLength;
            inHeader->nOffset += mConfig->inputBufferUsedLength;
        } else {
+            LOGW("AAC decoder returned error %d, substituting silence",
+                 decoderErr);
+
            memset(outHeader->pBuffer + outHeader->nOffset, 0, numOutBytes);
+
+            // Discard input buffer.
+            inHeader->nFilledLen = 0;
+
+            // fall through
        }

        if (mUpsamplingFactor == 2) {