diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-12 15:26:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-12 15:26:28 -0700 |
| commit | a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d (patch) | |
| tree | d312c1551b90ea09a2ebd28af151340eb6165014 | |
| parent | fd07d61614e4b358349d1d46a32f9477784404c4 (diff) | |
| parent | 1b0ae9e47273357e19a9beb22466319753e8242d (diff) | |
| download | frameworks_av-a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d.zip frameworks_av-a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d.tar.gz frameworks_av-a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d.tar.bz2 | |
am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
* commit '1b0ae9e47273357e19a9beb22466319753e8242d':
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp index e46463c..4133bdf 100644 --- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp @@ -848,6 +848,9 @@ void SoftAVCEncoder::onQueueFilled(OMX_U32 portIndex) { InputBufferInfo *inputBufInfo = mInputBufferInfoVec.begin(); outHeader->nTimeStamp = inputBufInfo->mTimeUs; outHeader->nFlags |= (inputBufInfo->mFlags | OMX_BUFFERFLAG_ENDOFFRAME); + if (mSawInputEOS) { + outHeader->nFlags |= OMX_BUFFERFLAG_EOS; + } outHeader->nFilledLen = dataLength; outInfo->mOwnedByUs = false; notifyFillBufferDone(outHeader); |