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

Commit 55fb8470 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo... 

am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"

* commit 'bf30787f':
  avcenc: Don't erase the InputBufferInfo before reading info from it
parents b7b8de88 bf30787f

media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -909,12 +909,12 @@ void SoftAVCEncoder::onQueueFilled(OMX_U32 portIndex) { 
        outQueue.erase(outQueue.begin());

        CHECK(!mInputBufferInfoVec.empty());

        InputBufferInfo *inputBufInfo = mInputBufferInfoVec.begin();

        mInputBufferInfoVec.erase(mInputBufferInfoVec.begin());

        outHeader->nTimeStamp = inputBufInfo->mTimeUs;

        outHeader->nFlags |= (inputBufInfo->mFlags | OMX_BUFFERFLAG_ENDOFFRAME);

        outHeader->nFilledLen = dataLength;

        outInfo->mOwnedByUs = false;

        notifyFillBufferDone(outHeader);

        mInputBufferInfoVec.erase(mInputBufferInfoVec.begin());

    }

}