Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d624daa authored by Hashcode's avatar Hashcode Committed by Gerrit Code Review
Browse files

[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: default avatarHashcode <hashcode0f@gmail.com>
parent d7a251d1

libvideoeditor/lvpp/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -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))

media/libstagefright/ACodec.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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>

media/libstagefright/Android.mk

+7 −1
Original line number Diff line number Diff line
@@ -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                \

media/libstagefright/CameraSource.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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;

media/libstagefright/OMXCodec.cpp

+7 −0
Original line number Diff line number Diff line
@@ -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