From 81eacb8bbf331501bb68c7f1fdd7ca1811b03f8f Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Tue, 21 Jun 2011 14:43:27 -0700
Subject: Log an error instead of asserting if the OMX plugin reports an error.

Change-Id: I2bae80706495c5c5d4257cd607c2141c070c5ff9
---
 media/libstagefright/omx/OMXMaster.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'media')

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 @@ void OMXMaster::addPlugin(OMXPluginBase *plugin) {
 
         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() {
-- 
cgit v1.1