commit 538596f71dc667b2f39c27d0bc9bbf119b0e6d58
author Marco Nelissen <marcone@google.com> Wed Nov 12 19:00:28 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 12 19:00:29 2014 +0000
tree a02a7204a9d6c323b7d7bfcf3f108933e9cd5dc8
parent 745602d87607521f4fe84c4f3a6388fbdb6a867c
parent 368e33700ed16acc8e99657fb84edd5d2806b34f

Merge "Fix looping sound playback" into lmp-mr1-dev

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index d7ddc89..11069e4 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -1349,9 +1349,12 @@
             uint32_t replyID;
             CHECK(msg->senderAwaitsResponse(&replyID));
 
-            if (!(mFlags & kFlagIsComponentAllocated) && mState != INITIALIZED
+            if (!((mFlags & kFlagIsComponentAllocated) && targetState == UNINITIALIZED) // See 1
+                    && mState != INITIALIZED
                     && mState != CONFIGURED && !isExecuting()) {
-                // We may be in "UNINITIALIZED" state already and
+                // 1) Permit release to shut down the component if allocated.
+                //
+                // 2) We may be in "UNINITIALIZED" state already and
                 // also shutdown the encoder/decoder without the
                 // client being aware of this if media server died while
                 // we were being stopped. The client would assume that