commit 7096b660548a15938b2c2fcfda7aa41ec16c4a72
author Andreas Huber <andih@google.com> Tue Jun 21 15:01:22 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 21 15:01:22 2011 -0700
tree 036798419a92c69126d71717f93e4a5bfa37325e
parent dba35bb98db03dcc01f8da6221822b329a23bac5
parent 274626469b716560d7539d0d830c41b83f3665a1

Merge "Log an error instead of asserting if the OMX plugin reports an error."

media/libstagefright/omx/OMXMaster.cpp

diff --git a/media/libstagefright/omx/OMXMaster.cpp b/media/libstagefright/omx/OMXMaster.cpp
index 545e6d4..504d470 100644
--- a/media/libstagefright/omx/OMXMaster.cpp
+++ b/media/libstagefright/omx/OMXMaster.cpp
@@ -86,7 +86,11 @@
 
         mPluginByComponentName.add(name8, plugin);
     }
-    CHECK_EQ(err, OMX_ErrorNoMore);
+
+    if (err != OMX_ErrorNoMore) {
+        LOGE("OMX plugin failed w/ error 0x%08x after registering %d "
+             "components", err, mPluginByComponentName.size());
+    }
 }
 
 void OMXMaster::clearPlugins() {