Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb

2011-01-19 09:49:32 -08:00
parent 42466b1cad ba1b16790a
commit 2597aedb38
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;
        }