diff options
| author | Andreas Huber <andih@google.com> | 2011-01-19 09:51:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-19 09:51:42 -0800 |
| commit | aa46ce8ac441981ecbf9e72fb4acc6677615efc9 (patch) | |
| tree | df692b18c7892879bff2c3144e03008a859094b2 | |
| parent | 09ad2d8994ac770f60607dc3b1c848531ce076e9 (diff) | |
| parent | 7509d7725207bfc28f7757c18518e21110c0736d (diff) | |
| download | frameworks_av-aa46ce8ac441981ecbf9e72fb4acc6677615efc9.zip frameworks_av-aa46ce8ac441981ecbf9e72fb4acc6677615efc9.tar.gz frameworks_av-aa46ce8ac441981ecbf9e72fb4acc6677615efc9.tar.bz2 | |
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.
| -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; } |