commit 94f60e297b9e45fac387cf10b6ce1acc067cb4a1
author Dave Burke <daveburke@google.com> Sat May 12 14:07:56 2012 -0700
committer Dave Burke <daveburke@google.com> Sat May 12 14:51:02 2012 -0700
tree 83ac9bfcf28f70d339a8f2e1bd1d834210eb4826
parent 808e7d16504cbe5b28bb88c31afb2542ab488965

Remove ASC workaround (now fixed in Franhofer library).

Change-Id: Ia0ce8155def9f6dea85da7f88942ac1b11c16823

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index 303b8ef..58ad065 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -267,15 +267,6 @@
         inBuffer[0] = header->pBuffer + header->nOffset;
         inBufferLength[0] = header->nFilledLen;
 
-        // Make the decoder more robust by pruning explicit backward compatible
-        // extension for LC, HE-AACv1 (SBR), HE-AACv2 (SBR + PS). We'll depend
-        // on implicit configuration.
-        if (inBufferLength[0] > 2) {
-            UCHAR aot = inBuffer[0][0] >> 3;
-            if (aot == 2 | aot == 5 | aot == 29) {
-                inBufferLength[0] = 2;
-            }
-        }
         AAC_DECODER_ERROR decoderErr =
             aacDecoder_ConfigRaw(mAACDecoder,
                                  inBuffer,