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

Commit 503261ce authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 4707c9b0: am f7baffd1: Merge "Make sure the drain buffer is big enough" into jb-mr2-dev 

* commit '4707c9b0':
  Make sure the drain buffer is big enough
parents 8160921d 4707c9b0

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;

}