Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da66e667 authored by Dave Burke's avatar Dave Burke Committed by Android (Google) Code Review
Browse files

Merge "Make decoder more robust to inaccurate ASCs." into jb-dev

parents af9e6a17 dc5db5d2

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+9 −0
Original line number Diff line number Diff line
@@ -267,6 +267,15 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) { 
        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,