diff options
| author | Marco Nelissen <marcone@google.com> | 2013-04-22 15:16:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-22 15:16:31 -0700 |
| commit | 6a169ccd48dc5c04d908b483de636e0da44e94a8 (patch) | |
| tree | b9e65ba8519ce966b4093855e48a7726fee61d3c /media/libstagefright/codecs | |
| parent | 174427e6c97ae75060d4a8ea86ff951ef94f2dcf (diff) | |
| parent | 6db76e8b8f561355198fc91dd95498a59ad38a20 (diff) | |
| download | frameworks_av-6a169ccd48dc5c04d908b483de636e0da44e94a8.zip frameworks_av-6a169ccd48dc5c04d908b483de636e0da44e94a8.tar.gz frameworks_av-6a169ccd48dc5c04d908b483de636e0da44e94a8.tar.bz2 | |
am 3030f344: Merge "Fixed the wrong timestamps issue about camera recording"
* commit '3030f344e77d14cf688c34f79c83a045c888825d':
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); } |