commit 5067a02052cf3ae8772ca68ef0b1ca526729361b
author Chong Zhang <chz@google.com> Mon Jun 18 10:51:43 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 18 10:51:43 2018 -0700
tree 531fa7a2306a8d82e7bd9d0040812d8a8d6a3ecf
parent 4782b353e11d2658a25abf3ee77bfc3b9fa917e1
parent d62d30773decf3cd44cbd2a4edc8f0daf7c0ca5b

stagefright: send EOS to encoder for thumbnail extraction
am: d62d30773d

Change-Id: I974f46a068c97f81753827f0a52f9bf9589210ee

media/libstagefright/FrameDecoder.cpp

diff --git a/media/libstagefright/FrameDecoder.cpp b/media/libstagefright/FrameDecoder.cpp
index 29a219f..6e94517 100644
--- a/media/libstagefright/FrameDecoder.cpp
+++ b/media/libstagefright/FrameDecoder.cpp
@@ -301,10 +301,13 @@
             err = mSource->read(&mediaBuffer, &mReadOptions);
             mReadOptions.clearSeekTo();
             if (err != OK) {
-                ALOGW("Input Error or EOS");
                 mHaveMoreInputs = false;
                 if (!mFirstSample && err == ERROR_END_OF_STREAM) {
+                    (void)mDecoder->queueInputBuffer(
+                            index, 0, 0, 0, MediaCodec::BUFFER_FLAG_EOS);
                     err = OK;
+                } else {
+                    ALOGW("Input Error: err=%d", err);
                 }
                 break;
             }