diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-12 15:42:30 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-12 15:42:30 -0700 |
commit | 71ea9f024c3943160110d9aa15b082b66516f72e (patch) | |
tree | 52148c366012fc3b92347dfbb69af97f128f076a /media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp | |
parent | 036012b9209d3614cbc3c0a96cece5776c45e77d (diff) | |
parent | a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d (diff) | |
download | frameworks_av-71ea9f024c3943160110d9aa15b082b66516f72e.zip frameworks_av-71ea9f024c3943160110d9aa15b082b66516f72e.tar.gz frameworks_av-71ea9f024c3943160110d9aa15b082b66516f72e.tar.bz2 |
am a923dd4e: am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
* commit 'a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d':
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
Diffstat (limited to 'media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp')
-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 81ee419..1d66120 100644 --- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp @@ -911,6 +911,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); |