commit fdcba38ccf3231fb10ce649e9f985c0b44d39d92
author Andreas Huber <andih@google.com> Tue Feb 09 10:04:57 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 09 10:04:57 2010 -0800
tree 2e3b36d62fede0cee1e42f8003cae09046b3ff43
parent 18457fd41e7b39534e54200c1f2392da3140ec9f
parent 9f4557ed0b29c85df1f2219408bad91ae4e29cbb

Merge "During shutdown, don't loop forever on a state transition to OMX_StateInvalid."

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index 70c6a58..2458d2a 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -129,11 +129,16 @@
             sendCommand(OMX_CommandStateSet, OMX_StateIdle);
             OMX_ERRORTYPE err;
             while ((err = OMX_GetState(mHandle, &state)) == OMX_ErrorNone
-                   && state != OMX_StateIdle) {
+                   && state != OMX_StateIdle
+                   && state != OMX_StateInvalid) {
                 usleep(100000);
             }
             CHECK_EQ(err, OMX_ErrorNone);
 
+            if (state == OMX_StateInvalid) {
+                break;
+            }
+
             // fall through
         }
 
@@ -146,7 +151,8 @@
 
             OMX_ERRORTYPE err;
             while ((err = OMX_GetState(mHandle, &state)) == OMX_ErrorNone
-                   && state != OMX_StateLoaded) {
+                   && state != OMX_StateLoaded
+                   && state != OMX_StateInvalid) {
                 LOGV("waiting for Loaded state...");
                 usleep(100000);
             }