Merge "Fixed the wrong timestamps issue about camera recording"

3030f344 · Marco Nelissen · Gerrit Code Review · 66abe3ae · 6e5b6ef1 · 3030f344
Commit 3030f344 authored 12 years ago by Marco Nelissen Committed by Gerrit Code Review 12 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp ...a/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp +1 -1

No files found.
--- a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
+++ b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
@@ -748,10 +748,10 @@ void SoftMPEG4Encoder::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;
+        mInputBufferInfoVec.erase(mInputBufferInfoVec.begin());
        outInfo->mOwnedByUs = false;
        notifyFillBufferDone(outHeader);
    }