diff options
| author | Marco Nelissen <marcone@google.com> | 2013-04-22 15:18:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-22 15:18:25 -0700 |
| commit | 4085c9aa8964304bc37175ab00f0b43ff7f6074c (patch) | |
| tree | c9e4aa008e1fbc65b6c9b666eb191243144135c1 /media/libstagefright/codecs | |
| parent | 2431f75b3e1c820215ad6d86e2383a40eb09012f (diff) | |
| parent | b0ec4e15704b77847c1d24e611029b6311d67dfe (diff) | |
| download | frameworks_av-4085c9aa8964304bc37175ab00f0b43ff7f6074c.zip frameworks_av-4085c9aa8964304bc37175ab00f0b43ff7f6074c.tar.gz frameworks_av-4085c9aa8964304bc37175ab00f0b43ff7f6074c.tar.bz2 | |
am b0ec4e15: am 3030f344: Merge "Fixed the wrong timestamps issue about camera recording"
* commit 'b0ec4e15704b77847c1d24e611029b6311d67dfe':
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); } |