diff options
| -rwxr-xr-x | libvideoeditor/lvpp/Android.mk | 7 | ||||
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 3 | ||||
| -rwxr-xr-x | media/libstagefright/Android.mk | 8 | ||||
| -rwxr-xr-x | media/libstagefright/CameraSource.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 7 | ||||
| -rw-r--r-- | media/libstagefright/id3/Android.mk | 4 | ||||
| -rw-r--r-- | media/libstagefright/timedtext/Android.mk | 4 | ||||
| -rw-r--r-- | media/libstagefright/wifi-display/Android.mk | 4 |
8 files changed, 39 insertions, 2 deletions
diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index 0ed7e6c..921f161 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -80,7 +80,6 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/lvpp \ $(TOP)/frameworks/av/services/audioflinger \ $(TOP)/frameworks/native/include/media/editor \ - $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/frameworks/native/services/audioflinger @@ -100,6 +99,12 @@ LOCAL_CFLAGS += -Wno-multichar \ -DUSE_STAGEFRIGHT_READERS \ -DUSE_STAGEFRIGHT_3GPP_READER +ifneq ($(TI_CUSTOM_DOMX_PATH),) +LOCAL_C_INCLUDES += $(TI_CUSTOM_DOMX_PATH)/omx_core/inc +else +LOCAL_C_INCLUDES += $(TOP)/frameworks/native/include/media/openmax +endif + include $(BUILD_SHARED_LIBRARY) #include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 20bdc32..1f4038c 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -35,6 +35,9 @@ #include <media/hardware/HardwareAPI.h> #include <OMX_Component.h> +#ifdef USE_TI_CUSTOM_DOMX +#include <OMX_TI_IVCommon.h> +#endif #ifdef USE_SAMSUNG_COLORFORMAT #include <sec_format.h> diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 0b72949..bfc83b0 100755 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -66,11 +66,17 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES:= \ $(TOP)/frameworks/av/include/media/stagefright/timedtext \ $(TOP)/frameworks/native/include/media/hardware \ - $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/external/flac/include \ $(TOP)/external/tremolo \ $(TOP)/external/openssl/include +ifneq ($(TI_CUSTOM_DOMX_PATH),) +LOCAL_C_INCLUDES += $(TI_CUSTOM_DOMX_PATH)/omx_core/inc +LOCAL_CPPFLAGS += -DUSE_TI_CUSTOM_DOMX +else +LOCAL_C_INCLUDES += $(TOP)/frameworks/native/include/media/openmax +endif + ifeq ($(BOARD_USES_QCOM_HARDWARE),true) LOCAL_SRC_FILES += \ ExtendedWriter.cpp \ diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index 602a51f..b8b9152 100755 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -31,6 +31,10 @@ #include <utils/String8.h> #include <cutils/properties.h> +#ifdef USE_TI_CUSTOM_DOMX +#include <OMX_TI_IVCommon.h> +#endif + namespace android { static const int64_t CAMERA_SOURCE_TIMEOUT_NS = 3000000000LL; diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index be782a0..42b6281 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -58,6 +58,13 @@ #include <sec_format.h> #endif +#ifdef USE_TI_CUSTOM_DOMX +#include <OMX_TI_Video.h> +#include <OMX_TI_Index.h> +#include <OMX_TI_IVCommon.h> +#include <ctype.h> +#endif + namespace android { #ifdef USE_SAMSUNG_COLORFORMAT diff --git a/media/libstagefright/id3/Android.mk b/media/libstagefright/id3/Android.mk index ff35d4a..d500aa6 100644 --- a/media/libstagefright/id3/Android.mk +++ b/media/libstagefright/id3/Android.mk @@ -4,6 +4,10 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ ID3.cpp +ifneq ($(TI_CUSTOM_DOMX_PATH),) +LOCAL_C_INCLUDES += $(TI_CUSTOM_DOMX_PATH)/omx_core/inc +endif + LOCAL_MODULE := libstagefright_id3 include $(BUILD_STATIC_LIBRARY) diff --git a/media/libstagefright/timedtext/Android.mk b/media/libstagefright/timedtext/Android.mk index f099bbd..4c6172a 100644 --- a/media/libstagefright/timedtext/Android.mk +++ b/media/libstagefright/timedtext/Android.mk @@ -14,6 +14,10 @@ LOCAL_C_INCLUDES:= \ $(TOP)/frameworks/av/include/media/stagefright/timedtext \ $(TOP)/frameworks/av/media/libstagefright +ifneq ($(TI_CUSTOM_DOMX_PATH),) +LOCAL_C_INCLUDES += $(TI_CUSTOM_DOMX_PATH)/omx_core/inc +endif + LOCAL_MODULE:= libstagefright_timedtext include $(BUILD_STATIC_LIBRARY) diff --git a/media/libstagefright/wifi-display/Android.mk b/media/libstagefright/wifi-display/Android.mk index 611bfff..07160f2 100644 --- a/media/libstagefright/wifi-display/Android.mk +++ b/media/libstagefright/wifi-display/Android.mk @@ -65,6 +65,10 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) +ifneq ($(TI_CUSTOM_DOMX_PATH),) +LOCAL_C_INCLUDES:= $(TI_CUSTOM_DOMX_PATH)/omx_core/inc +endif + LOCAL_SRC_FILES:= \ udptest.cpp \ |