diff options
| author | Adam77Root <adam77root@gmail.com> | 2013-01-05 19:13:51 +0100 |
|---|---|---|
| committer | Adam77Root <adam77root@gmail.com> | 2013-01-05 19:13:51 +0100 |
| commit | c21b9366f601d09225f3b3d06175dc91aa0eb02a (patch) | |
| tree | b243f238549bd73038f3a33176e87c71e36cd685 | |
| parent | 8143dbcc451e127400e50296fa78e0e2171d41d9 (diff) | |
| download | frameworks_av-c21b9366f601d09225f3b3d06175dc91aa0eb02a.zip frameworks_av-c21b9366f601d09225f3b3d06175dc91aa0eb02a.tar.gz frameworks_av-c21b9366f601d09225f3b3d06175dc91aa0eb02a.tar.bz2 | |
stagefright: add support for samsung proprietary omx
Change-Id: I79b7b4dd8a2ba71d7c95f067d13620260a2e0f63
| -rw-r--r-- | media/libstagefright/omx/Android.mk | 4 | ||||
| -rw-r--r-- | media/libstagefright/omx/OMXMaster.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/omx/Android.mk b/media/libstagefright/omx/Android.mk index d7fbbbe..5d6467d 100644 --- a/media/libstagefright/omx/Android.mk +++ b/media/libstagefright/omx/Android.mk @@ -23,6 +23,10 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright_foundation \ libdl +ifeq ($(BOARD_USES_PROPRIETARY_OMX),SAMSUNG) +LOCAL_CFLAGS += -DSAMSUNG_OMX +endif + LOCAL_MODULE:= libstagefright_omx include $(BUILD_SHARED_LIBRARY) diff --git a/media/libstagefright/omx/OMXMaster.cpp b/media/libstagefright/omx/OMXMaster.cpp index 6b6d0ab..c544770 100644 --- a/media/libstagefright/omx/OMXMaster.cpp +++ b/media/libstagefright/omx/OMXMaster.cpp @@ -45,6 +45,9 @@ OMXMaster::~OMXMaster() { void OMXMaster::addVendorPlugin() { addPlugin("libstagefrighthw.so"); +#ifdef SAMSUNG_OMX + addPlugin("libsomxcore.so"); +#endif } void OMXMaster::addPlugin(const char *libname) { |