commit 7bab024867996bec6dc4e3e31ed4570da9afbc25
author Lajos Molnar <lajos@google.com> Fri Oct 04 13:18:02 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 04 13:18:03 2013 +0000
tree 402b99793fb99b4803d5a0042288f5c084f58e46
parent 19fffcbd89a51af797265af2e11c97be5820a07d
parent a73c954d947748a3b6f630cf2c160fe55ec596e3

Merge "MediaCodec: avoid codec EOS if flushing during port reconfiguration" into klp-dev

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 9fa8a00..1adab38 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -3066,16 +3066,17 @@
     sp<ABuffer> buffer;
     int32_t err = OK;
     bool eos = false;
+    PortMode mode = getPortMode(kPortIndexInput);
 
     if (!msg->findBuffer("buffer", &buffer)) {
+        /* these are unfilled buffers returned by client */
         CHECK(msg->findInt32("err", &err));
 
         ALOGV("[%s] saw error %d instead of an input buffer",
              mCodec->mComponentName.c_str(), err);
 
         buffer.clear();
-
-        eos = true;
+        mode = KEEP_BUFFERS;
     }
 
     int32_t tmp;
@@ -3089,8 +3090,6 @@
 
     info->mStatus = BufferInfo::OWNED_BY_US;
 
-    PortMode mode = getPortMode(kPortIndexInput);
-
     switch (mode) {
         case KEEP_BUFFERS:
         {