diff options
| author | Hashcode <hashcode0f@gmail.com> | 2013-01-20 21:38:59 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2013-01-26 19:55:07 -0800 |
| commit | 6d624daae8e1abc16c87632db6b3759526ee12d4 (patch) | |
| tree | 226bf393e3f17fcf140b40b84667260719aceab5 /libvideoeditor | |
| parent | d7a251d1422895694f71764678ff48d021224752 (diff) | |
| download | frameworks_av-6d624daae8e1abc16c87632db6b3759526ee12d4.zip frameworks_av-6d624daae8e1abc16c87632db6b3759526ee12d4.tar.gz frameworks_av-6d624daae8e1abc16c87632db6b3759526ee12d4.tar.bz2 | |
[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/<manufacturer>/<device-name>/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 <hashcode0f@gmail.com>
Diffstat (limited to 'libvideoeditor')
| -rwxr-xr-x | libvideoeditor/lvpp/Android.mk | 7 |
1 files changed, 6 insertions, 1 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)) |