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

Commit f7baffd1 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Make sure the drain buffer is big enough" into jb-mr2-dev

parents 767fea95 e42f027d

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+6 −3
Original line number Diff line number Diff line
@@ -586,9 +586,12 @@ void SoftAAC2::onPortFlushCompleted(OMX_U32 portIndex) { 
}



void SoftAAC2::drainDecoder() {

    short buf [2048];

    aacDecoder_DecodeFrame(mAACDecoder, buf, 4096, AACDEC_FLUSH | AACDEC_CLRHIST | AACDEC_INTR);

    aacDecoder_DecodeFrame(mAACDecoder, buf, 4096, AACDEC_FLUSH | AACDEC_CLRHIST | AACDEC_INTR);

    // a buffer big enough for 6 channels of decoded HE-AAC

    short buf [2048*6];

    aacDecoder_DecodeFrame(mAACDecoder,

            buf, sizeof(buf), AACDEC_FLUSH | AACDEC_CLRHIST | AACDEC_INTR);

    aacDecoder_DecodeFrame(mAACDecoder,

            buf, sizeof(buf), AACDEC_FLUSH | AACDEC_CLRHIST | AACDEC_INTR);

    aacDecoder_SetParam(mAACDecoder, AAC_TPDEC_CLEAR_BUFFER, 1);

    mDecoderHasData = false;

}