commit 8f14c55248f88ebb85fb64bbb8e4f07ddb481952
author Andreas Huber <andih@google.com> Mon Apr 12 10:20:12 2010 -0700
committer Andreas Huber <andih@google.com> Mon Apr 12 10:20:12 2010 -0700
tree 438fa52095e8632e89a408091c999d0e572cd030
parent 63284ede623ca8a4119f1f44b86fbf017faba8dc

Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.

Change-Id: I4cabd18709c29db0a2763a01cc86525ba0b0aeb7
related-to-bug: 2575976

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 6037088..b9d6fbc 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2068,7 +2068,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;
 }