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 | 359cf1cac2a7851a59dfe4960a1a5992ac6fdb84 (patch) | |
tree | 7a193584341c2a5ee9ab7421378bca94287f2637 | |
parent | e891a7888141fcd3e7956bf80425c885992fa2bf (diff) | |
parent | a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d (diff) | |
download | frameworks_av-359cf1cac2a7851a59dfe4960a1a5992ac6fdb84.zip frameworks_av-359cf1cac2a7851a59dfe4960a1a5992ac6fdb84.tar.gz frameworks_av-359cf1cac2a7851a59dfe4960a1a5992ac6fdb84.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
-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); |