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

Commit 551e9560 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

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

parents 3d1d7767 122baae2

media/libstagefright/codecs/aacdec/SoftAAC.cpp

+8 −0
Original line number Diff line number Diff line
@@ -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) {