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.
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 41ce239..5366982 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2078,7 +2078,13 @@
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;
}