commit bae8df127ed4b76cce410922e33ce65e525bb405
author Lajos Molnar <lajos@google.com> Wed May 01 01:26:05 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 01 01:26:05 2013 +0000
tree 211cb405acf39136efa186519984351c5e85902f
parent ef052a9a7ca79340086bf636e536fb6420f5c2ac
parent 2ded8b53014602d25b20bade8ce46db95a8da4b5

Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition"

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 6d952c3..73bf6ba 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));
         }
     }