commit 3030f344e77d14cf688c34f79c83a045c888825d
author Marco Nelissen <marcone@google.com> Mon Apr 22 21:11:22 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 22 21:11:23 2013 +0000
tree 160dfb7ad0336370175220e53b7ebadd2e3c9303
parent 66abe3ae38665256c8fe97770f046bf9c68625aa
parent 6e5b6ef15bb39cc0aa3d8fb7d4f75d44e5aadd92

Merge "Fixed the wrong timestamps issue about camera recording"

media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp

diff --git a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
index 8bc0275..e02af90 100644
--- a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
+++ b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
@@ -748,10 +748,10 @@
         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);
     }