commit 8f908c0c211f8051f339bc85b01a6450f0dfd7d0
author Eino-Ville Talvala <etalvala@google.com> Tue Jun 04 16:17:17 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 04 16:17:17 2013 +0000
tree 4d7c2994036a50e84781ce2fbc8d494ca990e25a
parent 25b5617c56488fe5413473ffae6b43f6c5bddc96
parent 9454a9710b13c7d9262fe1cbd910235a3cd35f20

Merge "Camera2/3: Don't trigger AF when in INFINITY focus mode." into jb-mr2-dev

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 994d3f4..64e3885 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -748,12 +748,10 @@
         BufferInfo *info =
             &mBuffers[kPortIndexOutput].editItemAt(i);
 
-        if (info->mStatus !=
-                BufferInfo::OWNED_BY_COMPONENT) {
-            // We shouldn't have sent out any buffers to the client at this
-            // point.
-            CHECK_NE((int)info->mStatus, (int)BufferInfo::OWNED_BY_DOWNSTREAM);
-
+        // At this time some buffers may still be with the component
+        // or being drained.
+        if (info->mStatus != BufferInfo::OWNED_BY_COMPONENT &&
+            info->mStatus != BufferInfo::OWNED_BY_DOWNSTREAM) {
             CHECK_EQ((status_t)OK, freeBuffer(kPortIndexOutput, i));
         }
     }