diff options
| author | Marco Nelissen <marcone@google.com> | 2013-04-22 21:11:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-22 21:11:23 +0000 |
| commit | 6db76e8b8f561355198fc91dd95498a59ad38a20 (patch) | |
| tree | d9e41d3eb4f1284e157f1185b9eb725d7cdeaae5 /media/libstagefright/codecs | |
| parent | ef46e50c29935c16798b172acfb04720ff429690 (diff) | |
| parent | b483a82f02e86710fade1f581e9255f8f4afb246 (diff) | |
| download | frameworks_av-6db76e8b8f561355198fc91dd95498a59ad38a20.zip frameworks_av-6db76e8b8f561355198fc91dd95498a59ad38a20.tar.gz frameworks_av-6db76e8b8f561355198fc91dd95498a59ad38a20.tar.bz2 | |
Merge "Fixed the wrong timestamps issue about camera recording"
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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); } |