summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-06-21 14:43:27 -0700
committerAndreas Huber <andih@google.com>2011-06-21 14:43:27 -0700
commit81eacb8bbf331501bb68c7f1fdd7ca1811b03f8f (patch)
tree558040a8f602f779c504d28072a8467543a1d6af /media
parent185a19319e61ccd5e8806b7d00a20192dbcaf1f8 (diff)
downloadframeworks_av-81eacb8bbf331501bb68c7f1fdd7ca1811b03f8f.zip
frameworks_av-81eacb8bbf331501bb68c7f1fdd7ca1811b03f8f.tar.gz
frameworks_av-81eacb8bbf331501bb68c7f1fdd7ca1811b03f8f.tar.bz2
Log an error instead of asserting if the OMX plugin reports an error.
Change-Id: I2bae80706495c5c5d4257cd607c2141c070c5ff9
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/omx/OMXMaster.cpp6
1 files changed, 5 insertions, 1 deletions
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() {