diff options
| author | Lajos Molnar <lajos@google.com> | 2014-11-20 06:46:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-20 06:46:05 +0000 |
| commit | 8cb439a0dd0cf7c8d7b7fb8ebd617e7e2e7fc020 (patch) | |
| tree | 6886c173b933ead6193ba761fba1cfb59e27e395 | |
| parent | 7714658d7847c322410d6407ed2c360a2051ea96 (diff) | |
| parent | 490aba96990b012e67e093164b57e40bb3858db9 (diff) | |
| download | libstagefrighthw-8cb439a0dd0cf7c8d7b7fb8ebd617e7e2e7fc020.tar.gz | |
Merge "Enable ISV OMX core." into lmp-mr1-devandroid-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1master-soonglollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-release
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | WrsOMXPlugin.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
@@ -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) |