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

Commit 41afb3f2 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Fix AMR decoder am: d061b5b1 am: 988aae84 am: f36a731a am: 01e07967 am: e0a31e4b am: ce23e726 

am: e72ae585

* commit 'e72ae585':
  Fix AMR decoder
parents dc03c904 e72ae585

media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp

+7 −7
Original line number Diff line number Diff line
@@ -306,13 +306,6 @@ void SoftAMR::onQueueFilled(OMX_U32 /* portIndex */) { 
        BufferInfo *inInfo = *inQueue.begin();

        OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;



        if (inHeader->nFilledLen == 0) {

            inInfo->mOwnedByUs = false;

            inQueue.erase(inQueue.begin());

            notifyEmptyBufferDone(inHeader);

            continue;

        }



        BufferInfo *outInfo = *outQueue.begin();

        OMX_BUFFERHEADERTYPE *outHeader = outInfo->mHeader;
@@ -330,6 +323,13 @@ void SoftAMR::onQueueFilled(OMX_U32 /* portIndex */) { 
            return;

        }



        if (inHeader->nFilledLen == 0) {

            inInfo->mOwnedByUs = false;

            inQueue.erase(inQueue.begin());

            notifyEmptyBufferDone(inHeader);

            continue;

        }



        if (inHeader->nOffset == 0) {

            mAnchorTimeUs = inHeader->nTimeStamp;

            mNumSamplesOutput = 0;