OSDN Git Service

Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
authorJean-Baptiste Queru <jbq@google.com>
Wed, 12 Sep 2012 21:24:19 +0000 (14:24 -0700)
committerandroid code review <noreply-gerritcodereview@google.com>
Wed, 12 Sep 2012 21:24:20 +0000 (14:24 -0700)
1  2 
media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp

@@@ -846,8 -846,12 +846,11 @@@ void SoftAVCEncoder::onQueueFilled(OMX_
          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);
+         if (mSawInputEOS) {
+             outHeader->nFlags |= OMX_BUFFERFLAG_EOS;
+         }
          outHeader->nFilledLen = dataLength;
          outInfo->mOwnedByUs = false;
          notifyFillBufferDone(outHeader);