From c21b9366f601d09225f3b3d06175dc91aa0eb02a Mon Sep 17 00:00:00 2001 From: Adam77Root Date: Sat, 5 Jan 2013 19:13:51 +0100 Subject: stagefright: add support for samsung proprietary omx Change-Id: I79b7b4dd8a2ba71d7c95f067d13620260a2e0f63 --- media/libstagefright/omx/Android.mk | 4 ++++ media/libstagefright/omx/OMXMaster.cpp | 3 +++ 2 files changed, 7 insertions(+) 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) { -- cgit v1.1