diff options
| author | Andreas Huber <andih@google.com> | 2010-04-12 11:07:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-12 11:07:54 -0700 |
| commit | a3387afbc6dc5db0fd534ab5e3200f46b5a36acd (patch) | |
| tree | b1aec05ba013b64ef4617a35a941898b3398fde7 /media/libstagefright/OMXCodec.cpp | |
| parent | 23748a675245149d652b5ede781b4df90fca5d21 (diff) | |
| parent | b547d09ecc3da8ee300099da8ca7e2826bb6849a (diff) | |
| download | frameworks_av-a3387afbc6dc5db0fd534ab5e3200f46b5a36acd.zip frameworks_av-a3387afbc6dc5db0fd534ab5e3200f46b5a36acd.tar.gz frameworks_av-a3387afbc6dc5db0fd534ab5e3200f46b5a36acd.tar.bz2 | |
am f0a49f68: am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
Merge commit 'f0a49f68f0edc98fefbe14e3ddcf0d6853519293' into kraken
* commit 'f0a49f68f0edc98fefbe14e3ddcf0d6853519293':
Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 41ce2397..5366982 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -2078,7 +2078,13 @@ void OMXCodec::fillOutputBuffer(BufferInfo *info) { CODEC_LOGV("Calling fill_buffer on buffer %p", info->mBuffer); status_t err = mOMX->fillBuffer(mNode, info->mBuffer); - CHECK_EQ(err, OK); + + if (err != OK) { + CODEC_LOGE("fillBuffer failed w/ error 0x%08x", err); + + setState(ERROR); + return; + } info->mOwnedByComponent = true; } |