diff options
| author | Andreas Huber <andih@google.com> | 2011-01-19 09:49:32 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-19 09:49:32 -0800 |
| commit | 2597aedb3869e46f945359c529e03263c77a944d (patch) | |
| tree | 7c859bc8dded24883d25957c2a1f2809fe0b3f6d | |
| parent | 42466b1cad4cec1aa746809dfcca702456415be4 (diff) | |
| parent | ba1b16790a02abfba4e10708470d09ee642c3464 (diff) | |
| download | frameworks_base-2597aedb3869e46f945359c529e03263c77a944d.zip frameworks_base-2597aedb3869e46f945359c529e03263c77a944d.tar.gz frameworks_base-2597aedb3869e46f945359c529e03263c77a944d.tar.bz2 | |
Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index e516cb4..d842f65 100644 --- 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; } |