am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb

* commit '2597aedb3869e46f945359c529e03263c77a944d': Turn another assertion into a runtime error. Damn you surfaces.
2011-01-19 09:51:42 -08:00
parent 42ac32498a 2597aedb38
commit d3bf3eeadd
1 changed files with 5 additions and 1 deletions
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2233,7 +2233,11 @@ void OMXCodec::onCmdComplete(OMX_COMMANDTYPE cmd, OMX_U32 data) {
                enablePortAsync(portIndex);

                status_t err = allocateBuffersOnPort(portIndex);
-                CHECK_EQ(err, (status_t)OK);
+
+                if (err != OK) {
+                    CODEC_LOGE("allocateBuffersOnPort failed (err = %d)", err);
+                    setState(ERROR);
+                }
            }
            break;
        }