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

Commit 540b65bc authored by Dave Burke's avatar Dave Burke Committed by Android Git Automerger
Browse files

am 3eda271f: Merge "Clear the decoder input buffer after it signalled an error... 

am 3eda271f: Merge "Clear the decoder input buffer after it signalled an error to be able to continue." into jb-dev

* commit '3eda271f':
  Clear the decoder input buffer after it signalled an error to be able to continue.
parents b5733a94 3eda271f

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+3 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ void SoftAAC2::initPorts() { 


status_t SoftAAC2::initDecoder() {

    status_t status = UNKNOWN_ERROR;

    mAACDecoder = aacDecoder_Open(TT_MP4_RAW, /* num layers */ 1);

    mAACDecoder = aacDecoder_Open(TT_MP4_ADIF, /* num layers */ 1);

    if (mAACDecoder != NULL) {

        mStreamInfo = aacDecoder_GetStreamInfo(mAACDecoder);

        if (mStreamInfo != NULL) {
@@ -428,6 +428,8 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) { 
            // Discard input buffer.

            inHeader->nFilledLen = 0;



            aacDecoder_SetParam(mAACDecoder, AAC_TPDEC_CLEAR_BUFFER, 1);



            // fall through

        }