commit 14ae2c0d1aa6e32e97cbb62dabb604820e1e5152
author Wei Jia <wjia@google.com> Fri Jul 10 22:31:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 10 22:31:15 2015 +0000
tree 3ebff38da2d0ceb77a003504e12c482d3c1fe995
parent b6b19ca71e41276190fcd97351a0d19fae75bd34
parent 3175d2babfcdcb64f41309157e0436d00375ae4b

Merge "ACodec: call cancelBufferToNativeWindow() only when the buffer is owned by us." into mnc-dev

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 7d7c2a6..9206b5c 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -1063,9 +1063,11 @@
 
     for (OMX_U32 i = cancelStart; i < cancelEnd; i++) {
         BufferInfo *info = &mBuffers[kPortIndexOutput].editItemAt(i);
-        status_t error = cancelBufferToNativeWindow(info);
-        if (err == 0) {
-            err = error;
+        if (info->mStatus == BufferInfo::OWNED_BY_US) {
+            status_t error = cancelBufferToNativeWindow(info);
+            if (err == 0) {
+                err = error;
+            }
         }
     }
 
@@ -1152,9 +1154,11 @@
 
         for (OMX_U32 i = 0; i < mBuffers[kPortIndexOutput].size(); i++) {
             BufferInfo *info = &mBuffers[kPortIndexOutput].editItemAt(i);
-            status_t error = cancelBufferToNativeWindow(info);
-            if (err == OK) {
-                err = error;
+            if (info->mStatus == BufferInfo::OWNED_BY_US) {
+                status_t error = cancelBufferToNativeWindow(info);
+                if (err == OK) {
+                    err = error;
+                }
             }
         }