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

Commit 26a46c4f authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am f0a49f68: am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is... 

am f0a49f68: am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo

Merge commit 'f0a49f68' into kraken

* commit 'f0a49f68':
  Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
parents 967a263d f0a49f68

media/libstagefright/OMXCodec.cpp

+7 −1
Original line number Diff line number Diff line
@@ -2078,7 +2078,13 @@ void OMXCodec::fillOutputBuffer(BufferInfo *info) { 


    CODEC_LOGV("Calling fill_buffer on buffer %p", info->mBuffer);

    status_t err = mOMX->fillBuffer(mNode, info->mBuffer);

    CHECK_EQ(err, OK);



    if (err != OK) {

        CODEC_LOGE("fillBuffer failed w/ error 0x%08x", err);



        setState(ERROR);

        return;

    }



    info->mOwnedByComponent = true;

}