summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Hu <jason.hu@intel.com>2014-08-15 03:45:37 +0800
committerLajos Molnar <lajos@google.com>2014-11-19 14:11:50 -0800
commit490aba96990b012e67e093164b57e40bb3858db9 (patch)
tree368a70dbe678aa404ac0879e28278502d93daa83
parent419d34016dceec65ea137490668984eb80119df4 (diff)
downloadlibstagefrighthw-490aba96990b012e67e093164b57e40bb3858db9.tar.gz
Enable ISV OMX core.
Use ISV OMX core that will load the other OMX cores to make ISV work. Bug: 17383204 BZ: 227971 Change-Id: If14427edc974bdf1671877db43274dc0af53e0e6 Signed-off-by: Jason Hu <jason.hu@intel.com>
-rw-r--r--Android.mk4
-rw-r--r--WrsOMXPlugin.cpp4
2 files changed, 8 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index a6596b0..327b883 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,10 @@ ifeq ($(USE_MEDIASDK),true)
LOCAL_CFLAGS += -DUSE_MEDIASDK
endif
+ifeq ($(TARGET_HAS_ISV), true)
+LOCAL_CFLAGS +=-DTARGET_HAS_ISV
+endif
+
LOCAL_C_INCLUDES:= \
$(call include-path-for, frameworks-native)/media/hardware \
$(call include-path-for, frameworks-native)/media/openmax
diff --git a/WrsOMXPlugin.cpp b/WrsOMXPlugin.cpp
index f9c62e2..ee76ffe 100644
--- a/WrsOMXPlugin.cpp
+++ b/WrsOMXPlugin.cpp
@@ -45,10 +45,14 @@ OMXPluginBase *createOMXPlugin() {
WrsOMXPlugin::WrsOMXPlugin()
{
+#ifdef TARGET_HAS_ISV
+ AddCore("libisv_omx_core.so");
+#else
AddCore("libwrs_omxil_core_pvwrapped.so");
#if defined(USE_MEDIASDK)
AddCore("libmfx_omx_core.so");
#endif
+#endif
}
OMX_ERRORTYPE WrsOMXPlugin::AddCore(const char* coreName)