From 6d624daae8e1abc16c87632db6b3759526ee12d4 Mon Sep 17 00:00:00 2001 From: Hashcode Date: Sun, 20 Jan 2013 21:38:59 -0800 Subject: [3/3] libstagefright/videoeditor: Allow custom DOMX source instead of Google DOMX default Part 3 of 3 patches: To allow omap4 devices to use custom "domx" source via a new BoardConfig.mk item: TI_CUSTOM_DOMX_PATH := device///domx This setting provides for 3 changes during the build: 1. In hardware/ti/omap4xxx this settings stops standard Google domx source from being built and changes the domx reference for tiutils. 2. In frameworks/base it changes the default openmax references for frameworks/base/media/jni/mediaeditor/Android.mk to the new location 3. In frameworks/av changes the openmax references in 5 places, and adds new includes in ACodec.cpp, CameraSource.cpp and OMXCodec.cpp This is a combination of cherry-picks from omapzoom (with a more descriptive BoardConfig setting name): http://www.omapzoom.org/?p=platform/frameworks/av.git;a=commit;h=8044105ca117c2e99b35ad9f341d630fc5a9d2e0 http://www.omapzoom.org/?p=platform/frameworks/av.git;a=commit;h=4adf712d1f3f2050fe0010652bbba7ecb8468870 http://www.omapzoom.org/?p=platform/frameworks/av.git;a=commit;h=fa37231ca59872ac491461ca3c14e019834848e5 Change-Id: I53dbf120d515eaf5ec82688dcea4c670c173ed01 Signed-off-by: Hashcode --- media/libstagefright/Android.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'media/libstagefright/Android.mk') 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 \ -- cgit v1.1