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

Commit e61f13d2 authored by Martin Storsjo's avatar Martin Storsjo
Browse files

avcenc: Don't erase the InputBufferInfo before reading info from it 

Previously, the timestamp and flags were read from the InputBufferInfo
struct after it had been erased.

This fixes cases where the output timestamp from the avc encoder
could spuriously be garbage every now and then.

Change-Id: I21acf23cfac93bcc201a603feace6499ec6d8e76
parent 4b60ac04

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

+1 −1
Original line number Diff line number Diff line
@@ -846,12 +846,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());

    }

}