commit 551e95607ce83c0d491a2c12cdae4aa92197dc2c
author Andreas Huber <andih@google.com> Tue Jun 21 08:36:51 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 21 08:36:51 2011 -0700
tree a775eb0daa1f1075c94cda815a3280c040431129
parent 3d1d7767afc7c488197ec40a22739159c5110721
parent 122baae2f2aedca38fab723f7ad672044b0ce413

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

media/libstagefright/codecs/aacdec/SoftAAC.cpp

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC.cpp b/media/libstagefright/codecs/aacdec/SoftAAC.cpp
index 7ce6128..bbd6dbb 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC.cpp
@@ -367,7 +367,15 @@
             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) {