commit 3be5aad4d9560f94241d66a50a247a2f3060183b
author Andreas Huber <andih@google.com> Fri Feb 24 14:03:27 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 24 14:03:27 2012 -0800
tree aa8f425291da8dab52909b642f91e2d6c9738e54
parent ed07dafc2ea0edc24d1f2b9ae3fa74b860413f2a
parent b5ef6e5d9466842246741a01e1592e1c11d2ab50

Merge "Make sure we return input/output buffers to the codec not just while"

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index ad2dfab..e14b1c4 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -577,7 +577,7 @@
                 {
                     /* size_t index = */updateBuffers(kPortIndexInput, msg);
 
-                    if (mState == FLUSHING) {
+                    if (mState == FLUSHING || mState == STOPPING) {
                         returnBuffersToCodecOnPort(kPortIndexInput);
                         break;
                     }
@@ -596,7 +596,7 @@
                 {
                     /* size_t index = */updateBuffers(kPortIndexOutput, msg);
 
-                    if (mState == FLUSHING) {
+                    if (mState == FLUSHING || mState == STOPPING) {
                         returnBuffersToCodecOnPort(kPortIndexOutput);
                         break;
                     }