commit cbe6ac2f281362d9dfbff867dd414d5cc2f6d21e
author Chong Zhang <chz@google.com> Wed May 27 11:34:36 2015 -0700
committer Chong Zhang <chz@google.com> Wed May 27 13:05:33 2015 -0700
tree 53c12f83f91132a670efec4d0a982fa1f38e2304
parent 2d6b6601743c3c6960c6511a2cb774ef902759f4

SoftAVCEnc: encode EOS frame is size is non-zero

bug: 20947883
bug: 20507129
Change-Id: I557584e8566b8529329f35e0949cb3ee24965ff4

media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp

diff --git a/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp b/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp
index 6afac74..449d195 100755
--- a/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp
+++ b/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp
@@ -1188,7 +1188,10 @@
         BufferInfo *outputBufferInfo = *outQueue.begin();
         OMX_BUFFERHEADERTYPE *outputBufferHeader = outputBufferInfo->mHeader;
 
-        if (inputBufferHeader->nFlags & OMX_BUFFERFLAG_EOS) {
+        if (inputBufferHeader->nFlags & OMX_BUFFERFLAG_EOS &&
+                inputBufferHeader->nFilledLen == 0) {
+            mSawInputEOS = true;
+
             inQueue.erase(inQueue.begin());
             inputBufferInfo->mOwnedByUs = false;
             notifyEmptyBufferDone(inputBufferHeader);