From 7887e31764eac19b00ed882087d556c675da1e65 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 28 Jan 2014 12:56:33 -0800 Subject: Move Android.mks to their parent dir. So we don't need "../" to reference source files in the common/ directory. "../" in LOCAL_SRC_FILES causes build race condition: the path of object file of ../common/src/extra_data_handler.cpp in vdec actually is the same as the path of object file of ../common/src/extra_data_handler.cpp in venc. Bug: 12779537 Change-Id: Ifd7fef36810c15fbe7854aeb3d505fba63f5d7e2 (cherry picked from commit c9a7bd20d3891b002f6b0285692adb9d246036ae) --- mm-video-v4l2/Android.mk | 3 +- mm-video-v4l2/vidc/Android.mk | 3 + mm-video-v4l2/vidc/vdec.mk | 217 +++++++++++++++++++++++++++++++++++++ mm-video-v4l2/vidc/vdec/Android.mk | 217 ------------------------------------- mm-video-v4l2/vidc/venc.mk | 166 ++++++++++++++++++++++++++++ mm-video-v4l2/vidc/venc/Android.mk | 166 ---------------------------- 6 files changed, 387 insertions(+), 385 deletions(-) create mode 100644 mm-video-v4l2/vidc/Android.mk create mode 100644 mm-video-v4l2/vidc/vdec.mk delete mode 100755 mm-video-v4l2/vidc/vdec/Android.mk create mode 100644 mm-video-v4l2/vidc/venc.mk delete mode 100644 mm-video-v4l2/vidc/venc/Android.mk diff --git a/mm-video-v4l2/Android.mk b/mm-video-v4l2/Android.mk index 2d0a5335..e27c9703 100755 --- a/mm-video-v4l2/Android.mk +++ b/mm-video-v4l2/Android.mk @@ -1,6 +1,5 @@ OMX_VIDEO_PATH := $(call my-dir) include $(CLEAR_VARS) -include $(OMX_VIDEO_PATH)/vidc/vdec/Android.mk -include $(OMX_VIDEO_PATH)/vidc/venc/Android.mk +include $(OMX_VIDEO_PATH)/vidc/Android.mk include $(OMX_VIDEO_PATH)/DivxDrmDecrypt/Android.mk diff --git a/mm-video-v4l2/vidc/Android.mk b/mm-video-v4l2/vidc/Android.mk new file mode 100644 index 00000000..b2294aa0 --- /dev/null +++ b/mm-video-v4l2/vidc/Android.mk @@ -0,0 +1,3 @@ +LOCAL_PATH := $(call my-dir) + +include $(LOCAL_PATH)/vdec.mk $(LOCAL_PATH)/venc.mk diff --git a/mm-video-v4l2/vidc/vdec.mk b/mm-video-v4l2/vidc/vdec.mk new file mode 100644 index 00000000..366d0bd5 --- /dev/null +++ b/mm-video-v4l2/vidc/vdec.mk @@ -0,0 +1,217 @@ +ifneq ($(BUILD_TINY_ANDROID),true) + +ROOT_DIR := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_PATH:= $(ROOT_DIR) + +# --------------------------------------------------------------------------------- +# Common definitons +# --------------------------------------------------------------------------------- + +libOmxVdec-def := -D__alignx\(x\)=__attribute__\(\(__aligned__\(x\)\)\) +libOmxVdec-def += -D__align=__alignx +libOmxVdec-def += -Dinline=__inline +libOmxVdec-def += -g -O3 +libOmxVdec-def += -DIMAGE_APPS_PROC +libOmxVdec-def += -D_ANDROID_ +libOmxVdec-def += -DCDECL +libOmxVdec-def += -DT_ARM +libOmxVdec-def += -DNO_ARM_CLZ +libOmxVdec-def += -UENABLE_DEBUG_LOW +libOmxVdec-def += -DENABLE_DEBUG_HIGH +libOmxVdec-def += -DENABLE_DEBUG_ERROR +libOmxVdec-def += -UINPUT_BUFFER_LOG +libOmxVdec-def += -UOUTPUT_BUFFER_LOG +ifeq ($(TARGET_BOARD_PLATFORM),msm8660) +libOmxVdec-def += -DMAX_RES_1080P +libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT +libOmxVdec-def += -DTEST_TS_FROM_SEI +endif +ifeq ($(TARGET_BOARD_PLATFORM),msm8960) +libOmxVdec-def += -DMAX_RES_1080P +libOmxVdec-def += -DMAX_RES_1080P_EBI +libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT +libOmxVdec-def += -D_MSM8960_ +endif +ifeq ($(TARGET_BOARD_PLATFORM),msm8974) +libOmxVdec-def += -DMAX_RES_1080P +libOmxVdec-def += -DMAX_RES_1080P_EBI +libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT +libOmxVdec-def += -D_MSM8974_ +libOmxVdec-def += -D_HEVC_USE_ADSP_HEAP_ +endif +ifeq ($(TARGET_BOARD_PLATFORM),msm7627a) +libOmxVdec-def += -DMAX_RES_720P +endif +ifeq ($(TARGET_BOARD_PLATFORM),msm7630_surf) +libOmxVdec-def += -DMAX_RES_720P +endif +ifeq ($(TARGET_BOARD_PLATFORM),msm8610) +libOmxVdec-def += -DMAX_RES_1080P +libOmxVdec-def += -DMAX_RES_1080P_EBI +libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT +libOmxVdec-def += -DSMOOTH_STREAMING_DISABLED +libOmxVdec-def += -DH264_PROFILE_LEVEL_CHECK +libOmxVdec-def += -D_MSM8974_ +endif +ifeq ($(TARGET_BOARD_PLATFORM),msm8226) +libOmxVdec-def += -DMAX_RES_1080P +libOmxVdec-def += -DMAX_RES_1080P_EBI +libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT +libOmxVdec-def += -D_MSM8974_ +endif +ifeq ($(TARGET_BOARD_PLATFORM),apq8084) +libOmxVdec-def += -DMAX_RES_1080P +libOmxVdec-def += -DMAX_RES_1080P_EBI +libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT +libOmxVdec-def += -D_MSM8974_ +endif +ifeq ($(TARGET_BOARD_PLATFORM),mpq8092) +libOmxVdec-def += -DMAX_RES_1080P +libOmxVdec-def += -DMAX_RES_1080P_EBI +libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT +libOmxVdec-def += -D_MSM8974_ +endif +libOmxVdec-def += -D_ANDROID_ICS_ + +ifeq ($(TARGET_USES_ION),true) +libOmxVdec-def += -DUSE_ION +endif + +# --------------------------------------------------------------------------------- +# Make the Shared library (libOmxVdec) +# --------------------------------------------------------------------------------- + +include $(CLEAR_VARS) +LOCAL_PATH:= $(ROOT_DIR) + +libmm-vdec-inc := bionic/libc/include +libmm-vdec-inc += bionic/libstdc++/include +libmm-vdec-inc += $(LOCAL_PATH)/vdec/inc +libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc +libmm-vdec-inc += hardware/qcom/media/mm-core/inc +#DRM include - Interface which loads the DRM library +libmm-vdec-inc += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc +libmm-vdec-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libgralloc +libmm-vdec-inc += frameworks/native/include/media/openmax +libmm-vdec-inc += frameworks/native/include/media/hardware +libmm-vdec-inc += $(vdec-inc) +libmm-vdec-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libqdutils +libmm-vdec-inc += hardware/qcom/media/libc2dcolorconvert +libmm-vdec-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libcopybit +libmm-vdec-inc += frameworks/av/include/media/stagefright + + +LOCAL_MODULE := libOmxVdec +LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS := $(libOmxVdec-def) +LOCAL_C_INCLUDES += $(libmm-vdec-inc) + +LOCAL_PRELINK_MODULE := false +LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl + +LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt +LOCAL_SHARED_LIBRARIES += libqdMetaData + +LOCAL_SRC_FILES := vdec/src/frameparser.cpp +LOCAL_SRC_FILES += vdec/src/h264_utils.cpp +LOCAL_SRC_FILES += vdec/src/ts_parser.cpp +LOCAL_SRC_FILES += vdec/src/mp4_utils.cpp +ifneq ($(filter msm8974 msm8610 msm8226 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) +LOCAL_SRC_FILES += vdec/src/omx_vdec_msm8974.cpp +else +LOCAL_SHARED_LIBRARIES += libhardware +libmm-vdec-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libhwcomposer +LOCAL_SRC_FILES += vdec/src/power_module.cpp +LOCAL_SRC_FILES += vdec/src/omx_vdec.cpp +endif + +LOCAL_SRC_FILES += common/src/extra_data_handler.cpp +LOCAL_SRC_FILES += common/src/vidc_color_converter.cpp + +include $(BUILD_SHARED_LIBRARY) + + +# --------------------------------------------------------------------------------- +# Make the Shared library (libOmxVdecHevc) +# --------------------------------------------------------------------------------- + +include $(CLEAR_VARS) +LOCAL_PATH:= $(ROOT_DIR) + +ifneq ($(filter msm8974 msm8610 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) + +LOCAL_MODULE := libOmxVdecHevc +LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS := $(libOmxVdec-def) +LOCAL_C_INCLUDES += $(libmm-vdec-inc) + +LOCAL_PRELINK_MODULE := false +LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl + +LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt +LOCAL_SHARED_LIBRARIES += libqdMetaData + +LOCAL_SRC_FILES := vdec/src/frameparser.cpp +LOCAL_SRC_FILES += vdec/src/h264_utils.cpp +LOCAL_SRC_FILES += vdec/src/ts_parser.cpp +LOCAL_SRC_FILES += vdec/src/mp4_utils.cpp + +LOCAL_SRC_FILES += vdec/src/omx_vdec_hevc.cpp +LOCAL_SRC_FILES += vdec/src/hevc_utils.cpp + +LOCAL_SRC_FILES += common/src/extra_data_handler.cpp +LOCAL_SRC_FILES += common/src/vidc_color_converter.cpp + +include $(BUILD_SHARED_LIBRARY) + +endif + +# --------------------------------------------------------------------------------- +# Make the apps-test (mm-vdec-omx-test) +# --------------------------------------------------------------------------------- +include $(CLEAR_VARS) + +mm-vdec-test-inc := hardware/qcom/media/mm-core/inc +mm-vdec-test-inc += $(LOCAL_PATH)/vdec/inc +mm-vdec-test-inc += $(vdec-inc) + +LOCAL_MODULE := mm-vdec-omx-test +LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS := $(libOmxVdec-def) +LOCAL_C_INCLUDES := $(mm-vdec-test-inc) + +LOCAL_PRELINK_MODULE := false +LOCAL_SHARED_LIBRARIES := libutils libOmxCore libOmxVdec libbinder libcutils + +LOCAL_SRC_FILES := vdec/src/queue.c +LOCAL_SRC_FILES += vdec/test/omx_vdec_test.cpp + +include $(BUILD_EXECUTABLE) + +# --------------------------------------------------------------------------------- +# Make the driver-test (mm-video-driver-test) +# --------------------------------------------------------------------------------- +include $(CLEAR_VARS) + +mm-vdec-drv-test-inc := hardware/qcom/media/mm-core/inc +mm-vdec-drv-test-inc += $(LOCAL_PATH)/vdec/inc +mm-vdec-drv-test-inc += $(vdec-inc) + +LOCAL_MODULE := mm-video-driver-test +LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS := $(libOmxVdec-def) +LOCAL_C_INCLUDES := $(mm-vdec-drv-test-inc) +LOCAL_PRELINK_MODULE := false + +LOCAL_SRC_FILES := vdec/src/message_queue.c +LOCAL_SRC_FILES += vdec/test/decoder_driver_test.c + +include $(BUILD_EXECUTABLE) + +endif #BUILD_TINY_ANDROID + +# --------------------------------------------------------------------------------- +# END +# --------------------------------------------------------------------------------- diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk deleted file mode 100755 index 1f08fad5..00000000 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ /dev/null @@ -1,217 +0,0 @@ -ifneq ($(BUILD_TINY_ANDROID),true) - -ROOT_DIR := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_PATH:= $(ROOT_DIR) - -# --------------------------------------------------------------------------------- -# Common definitons -# --------------------------------------------------------------------------------- - -libOmxVdec-def := -D__alignx\(x\)=__attribute__\(\(__aligned__\(x\)\)\) -libOmxVdec-def += -D__align=__alignx -libOmxVdec-def += -Dinline=__inline -libOmxVdec-def += -g -O3 -libOmxVdec-def += -DIMAGE_APPS_PROC -libOmxVdec-def += -D_ANDROID_ -libOmxVdec-def += -DCDECL -libOmxVdec-def += -DT_ARM -libOmxVdec-def += -DNO_ARM_CLZ -libOmxVdec-def += -UENABLE_DEBUG_LOW -libOmxVdec-def += -DENABLE_DEBUG_HIGH -libOmxVdec-def += -DENABLE_DEBUG_ERROR -libOmxVdec-def += -UINPUT_BUFFER_LOG -libOmxVdec-def += -UOUTPUT_BUFFER_LOG -ifeq ($(TARGET_BOARD_PLATFORM),msm8660) -libOmxVdec-def += -DMAX_RES_1080P -libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT -libOmxVdec-def += -DTEST_TS_FROM_SEI -endif -ifeq ($(TARGET_BOARD_PLATFORM),msm8960) -libOmxVdec-def += -DMAX_RES_1080P -libOmxVdec-def += -DMAX_RES_1080P_EBI -libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT -libOmxVdec-def += -D_MSM8960_ -endif -ifeq ($(TARGET_BOARD_PLATFORM),msm8974) -libOmxVdec-def += -DMAX_RES_1080P -libOmxVdec-def += -DMAX_RES_1080P_EBI -libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT -libOmxVdec-def += -D_MSM8974_ -libOmxVdec-def += -D_HEVC_USE_ADSP_HEAP_ -endif -ifeq ($(TARGET_BOARD_PLATFORM),msm7627a) -libOmxVdec-def += -DMAX_RES_720P -endif -ifeq ($(TARGET_BOARD_PLATFORM),msm7630_surf) -libOmxVdec-def += -DMAX_RES_720P -endif -ifeq ($(TARGET_BOARD_PLATFORM),msm8610) -libOmxVdec-def += -DMAX_RES_1080P -libOmxVdec-def += -DMAX_RES_1080P_EBI -libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT -libOmxVdec-def += -DSMOOTH_STREAMING_DISABLED -libOmxVdec-def += -DH264_PROFILE_LEVEL_CHECK -libOmxVdec-def += -D_MSM8974_ -endif -ifeq ($(TARGET_BOARD_PLATFORM),msm8226) -libOmxVdec-def += -DMAX_RES_1080P -libOmxVdec-def += -DMAX_RES_1080P_EBI -libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT -libOmxVdec-def += -D_MSM8974_ -endif -ifeq ($(TARGET_BOARD_PLATFORM),apq8084) -libOmxVdec-def += -DMAX_RES_1080P -libOmxVdec-def += -DMAX_RES_1080P_EBI -libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT -libOmxVdec-def += -D_MSM8974_ -endif -ifeq ($(TARGET_BOARD_PLATFORM),mpq8092) -libOmxVdec-def += -DMAX_RES_1080P -libOmxVdec-def += -DMAX_RES_1080P_EBI -libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT -libOmxVdec-def += -D_MSM8974_ -endif -libOmxVdec-def += -D_ANDROID_ICS_ - -ifeq ($(TARGET_USES_ION),true) -libOmxVdec-def += -DUSE_ION -endif - -# --------------------------------------------------------------------------------- -# Make the Shared library (libOmxVdec) -# --------------------------------------------------------------------------------- - -include $(CLEAR_VARS) -LOCAL_PATH:= $(ROOT_DIR) - -libmm-vdec-inc := bionic/libc/include -libmm-vdec-inc += bionic/libstdc++/include -libmm-vdec-inc += $(LOCAL_PATH)/inc -libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc -libmm-vdec-inc += hardware/qcom/media/mm-core/inc -#DRM include - Interface which loads the DRM library -libmm-vdec-inc += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc -libmm-vdec-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libgralloc -libmm-vdec-inc += frameworks/native/include/media/openmax -libmm-vdec-inc += frameworks/native/include/media/hardware -libmm-vdec-inc += $(vdec-inc) -libmm-vdec-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libqdutils -libmm-vdec-inc += hardware/qcom/media/libc2dcolorconvert -libmm-vdec-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libcopybit -libmm-vdec-inc += frameworks/av/include/media/stagefright - - -LOCAL_MODULE := libOmxVdec -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := $(libOmxVdec-def) -LOCAL_C_INCLUDES += $(libmm-vdec-inc) - -LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl - -LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt -LOCAL_SHARED_LIBRARIES += libqdMetaData - -LOCAL_SRC_FILES := src/frameparser.cpp -LOCAL_SRC_FILES += src/h264_utils.cpp -LOCAL_SRC_FILES += src/ts_parser.cpp -LOCAL_SRC_FILES += src/mp4_utils.cpp -ifneq ($(filter msm8974 msm8610 msm8226 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) -LOCAL_SRC_FILES += src/omx_vdec_msm8974.cpp -else -LOCAL_SHARED_LIBRARIES += libhardware -libmm-vdec-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libhwcomposer -LOCAL_SRC_FILES += src/power_module.cpp -LOCAL_SRC_FILES += src/omx_vdec.cpp -endif - -LOCAL_SRC_FILES += ../common/src/extra_data_handler.cpp -LOCAL_SRC_FILES += ../common/src/vidc_color_converter.cpp - -include $(BUILD_SHARED_LIBRARY) - - -# --------------------------------------------------------------------------------- -# Make the Shared library (libOmxVdecHevc) -# --------------------------------------------------------------------------------- - -include $(CLEAR_VARS) -LOCAL_PATH:= $(ROOT_DIR) - -ifneq ($(filter msm8974 msm8610 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) - -LOCAL_MODULE := libOmxVdecHevc -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := $(libOmxVdec-def) -LOCAL_C_INCLUDES += $(libmm-vdec-inc) - -LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl - -LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt -LOCAL_SHARED_LIBRARIES += libqdMetaData - -LOCAL_SRC_FILES := src/frameparser.cpp -LOCAL_SRC_FILES += src/h264_utils.cpp -LOCAL_SRC_FILES += src/ts_parser.cpp -LOCAL_SRC_FILES += src/mp4_utils.cpp - -LOCAL_SRC_FILES += src/omx_vdec_hevc.cpp -LOCAL_SRC_FILES += src/hevc_utils.cpp - -LOCAL_SRC_FILES += ../common/src/extra_data_handler.cpp -LOCAL_SRC_FILES += ../common/src/vidc_color_converter.cpp - -include $(BUILD_SHARED_LIBRARY) - -endif - -# --------------------------------------------------------------------------------- -# Make the apps-test (mm-vdec-omx-test) -# --------------------------------------------------------------------------------- -include $(CLEAR_VARS) - -mm-vdec-test-inc := hardware/qcom/media/mm-core/inc -mm-vdec-test-inc += $(LOCAL_PATH)/inc -mm-vdec-test-inc += $(vdec-inc) - -LOCAL_MODULE := mm-vdec-omx-test -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := $(libOmxVdec-def) -LOCAL_C_INCLUDES := $(mm-vdec-test-inc) - -LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES := libutils libOmxCore libOmxVdec libbinder libcutils - -LOCAL_SRC_FILES := src/queue.c -LOCAL_SRC_FILES += test/omx_vdec_test.cpp - -include $(BUILD_EXECUTABLE) - -# --------------------------------------------------------------------------------- -# Make the driver-test (mm-video-driver-test) -# --------------------------------------------------------------------------------- -include $(CLEAR_VARS) - -mm-vdec-drv-test-inc := hardware/qcom/media/mm-core/inc -mm-vdec-drv-test-inc += $(LOCAL_PATH)/inc -mm-vdec-drv-test-inc += $(vdec-inc) - -LOCAL_MODULE := mm-video-driver-test -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := $(libOmxVdec-def) -LOCAL_C_INCLUDES := $(mm-vdec-drv-test-inc) -LOCAL_PRELINK_MODULE := false - -LOCAL_SRC_FILES := src/message_queue.c -LOCAL_SRC_FILES += test/decoder_driver_test.c - -include $(BUILD_EXECUTABLE) - -endif #BUILD_TINY_ANDROID - -# --------------------------------------------------------------------------------- -# END -# --------------------------------------------------------------------------------- diff --git a/mm-video-v4l2/vidc/venc.mk b/mm-video-v4l2/vidc/venc.mk new file mode 100644 index 00000000..27e89e30 --- /dev/null +++ b/mm-video-v4l2/vidc/venc.mk @@ -0,0 +1,166 @@ +ifneq ($(BUILD_TINY_ANDROID),true) + +ROOT_DIR := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_PATH:= $(ROOT_DIR) + +# --------------------------------------------------------------------------------- +# Common definitons +# --------------------------------------------------------------------------------- + +libmm-venc-def := -g -O3 -Dlrintf=_ffix_r +libmm-venc-def += -D__align=__alignx +libmm-venc-def += -D__alignx\(x\)=__attribute__\(\(__aligned__\(x\)\)\) +libmm-venc-def += -DT_ARM +libmm-venc-def += -Dinline=__inline +libmm-venc-def += -D_ANDROID_ +libmm-venc-def += -UENABLE_DEBUG_LOW +libmm-venc-def += -DENABLE_DEBUG_HIGH +libmm-venc-def += -DENABLE_DEBUG_ERROR +libmm-venc-def += -UINPUT_BUFFER_LOG +libmm-venc-def += -UOUTPUT_BUFFER_LOG +libmm-venc-def += -USINGLE_ENCODER_INSTANCE +ifeq ($(TARGET_BOARD_PLATFORM),msm8660) +libmm-venc-def += -DMAX_RES_1080P +libmm-venc-def += -UENABLE_GET_SYNTAX_HDR +endif +ifeq ($(TARGET_BOARD_PLATFORM),msm8960) +libmm-venc-def += -DMAX_RES_1080P +libmm-venc-def += -DMAX_RES_1080P_EBI +libmm-venc-def += -UENABLE_GET_SYNTAX_HDR +endif +ifeq ($(TARGET_BOARD_PLATFORM),msm8974) +libmm-venc-def += -DMAX_RES_1080P +libmm-venc-def += -DMAX_RES_1080P_EBI +libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT +libmm-venc-def += -D_MSM8974_ +endif +ifeq ($(TARGET_BOARD_PLATFORM),msm7627a) +libmm-venc-def += -DMAX_RES_720P +endif +ifeq ($(TARGET_BOARD_PLATFORM),msm7630_surf) +libmm-venc-def += -DMAX_RES_720P +endif +ifeq ($(TARGET_BOARD_PLATFORM),msm8610) +libmm-venc-def += -DMAX_RES_720P +libmm-venc-def += -D_MSM8974_ +endif +ifeq ($(TARGET_BOARD_PLATFORM),msm8226) +libmm-venc-def += -DMAX_RES_1080P +libmm-venc-def += -D_MSM8974_ +endif +ifeq ($(TARGET_BOARD_PLATFORM),apq8084) +libmm-venc-def += -DMAX_RES_1080P +libmm-venc-def += -DMAX_RES_1080P_EBI +libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT +libmm-venc-def += -D_MSM8974_ +endif +ifeq ($(TARGET_BOARD_PLATFORM),mpq8092) +libmm-venc-def += -DMAX_RES_1080P +libmm-venc-def += -DMAX_RES_1080P_EBI +libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT +libmm-venc-def += -D_MSM8974_ +endif + +ifeq ($(TARGET_USES_ION),true) +libmm-venc-def += -DUSE_ION +endif + +libmm-venc-def += -D_ANDROID_ICS_ +# --------------------------------------------------------------------------------- +# Make the Shared library (libOmxVenc) +# --------------------------------------------------------------------------------- + +include $(CLEAR_VARS) + +libmm-venc-inc := bionic/libc/include +libmm-venc-inc += bionic/libstdc++/include +libmm-venc-inc += $(LOCAL_PATH)/venc/inc +libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc +libmm-venc-inc += hardware/qcom/media/mm-core/inc +libmm-venc-inc += hardware/qcom/media/libstagefrighthw +libmm-venc-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libgralloc +libmm-venc-inc += frameworks/native/include/media/hardware +libmm-venc-inc += frameworks/native/include/media/openmax +libmm-venc-inc += hardware/qcom/media/libc2dcolorconvert +libmm-venc-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libcopybit +libmm-venc-inc += frameworks/av/include/media/stagefright +libmm-venc-inc += frameworks/av/include/media/hardware +libmm-venc-inc += $(venc-inc) + +LOCAL_MODULE := libOmxVenc +LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS := $(libmm-venc-def) +LOCAL_C_INCLUDES := $(libmm-venc-inc) + +LOCAL_PRELINK_MODULE := false +LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \ + libc2dcolorconvert libdl + +LOCAL_SRC_FILES := venc/src/omx_video_base.cpp +LOCAL_SRC_FILES += venc/src/omx_video_encoder.cpp +ifneq ($(filter msm8974 msm8610 msm8226 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) +LOCAL_SRC_FILES += venc/src/video_encoder_device_v4l2.cpp +else +LOCAL_SRC_FILES += venc/src/video_encoder_device.cpp +endif + +LOCAL_SRC_FILES += common/src/extra_data_handler.cpp + +include $(BUILD_SHARED_LIBRARY) + +# ----------------------------------------------------------------------------- +# # Make the apps-test (mm-venc-omx-test720p) +# ----------------------------------------------------------------------------- + +include $(CLEAR_VARS) + +mm-venc-test720p-inc := $(TARGET_OUT_HEADERS)/mm-core +mm-venc-test720p-inc += $(LOCAL_PATH)/venc/inc +mm-venc-test720p-inc += $(OMX_VIDEO_PATH)/vidc/common/inc +mm-venc-test720p-inc += hardware/qcom/media/mm-core/inc +mm-venc-test720p-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libgralloc +mm-venc-test720p-inc += $(venc-inc) + +LOCAL_MODULE := mm-venc-omx-test720p +LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS := $(libmm-venc-def) +LOCAL_C_INCLUDES := $(mm-venc-test720p-inc) +LOCAL_PRELINK_MODULE := false +LOCAL_SHARED_LIBRARIES := libmm-omxcore libOmxVenc libbinder liblog + +LOCAL_SRC_FILES := venc/test/venc_test.cpp +LOCAL_SRC_FILES += venc/test/camera_test.cpp +LOCAL_SRC_FILES += venc/test/venc_util.c +LOCAL_SRC_FILES += venc/test/fb_test.c + +include $(BUILD_EXECUTABLE) + +# ----------------------------------------------------------------------------- +# Make the apps-test (mm-video-driver-test) +# ----------------------------------------------------------------------------- + +include $(CLEAR_VARS) + +venc-test-inc += $(LOCAL_PATH)/venc/inc +venc-test-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libgralloc +venc-test-inc += $(venc-inc) + +LOCAL_MODULE := mm-video-encdrv-test +LOCAL_MODULE_TAGS := optional +LOCAL_C_INCLUDES := $(venc-test-inc) +LOCAL_C_INCLUDES += hardware/qcom/media/mm-core/inc + +LOCAL_PRELINK_MODULE := false + +LOCAL_SRC_FILES := venc/test/video_encoder_test.c +LOCAL_SRC_FILES += venc/test/queue.c + +include $(BUILD_EXECUTABLE) + +endif #BUILD_TINY_ANDROID + +# --------------------------------------------------------------------------------- +# END +# --------------------------------------------------------------------------------- diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk deleted file mode 100644 index 1488c879..00000000 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ /dev/null @@ -1,166 +0,0 @@ -ifneq ($(BUILD_TINY_ANDROID),true) - -ROOT_DIR := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_PATH:= $(ROOT_DIR) - -# --------------------------------------------------------------------------------- -# Common definitons -# --------------------------------------------------------------------------------- - -libmm-venc-def := -g -O3 -Dlrintf=_ffix_r -libmm-venc-def += -D__align=__alignx -libmm-venc-def += -D__alignx\(x\)=__attribute__\(\(__aligned__\(x\)\)\) -libmm-venc-def += -DT_ARM -libmm-venc-def += -Dinline=__inline -libmm-venc-def += -D_ANDROID_ -libmm-venc-def += -UENABLE_DEBUG_LOW -libmm-venc-def += -DENABLE_DEBUG_HIGH -libmm-venc-def += -DENABLE_DEBUG_ERROR -libmm-venc-def += -UINPUT_BUFFER_LOG -libmm-venc-def += -UOUTPUT_BUFFER_LOG -libmm-venc-def += -USINGLE_ENCODER_INSTANCE -ifeq ($(TARGET_BOARD_PLATFORM),msm8660) -libmm-venc-def += -DMAX_RES_1080P -libmm-venc-def += -UENABLE_GET_SYNTAX_HDR -endif -ifeq ($(TARGET_BOARD_PLATFORM),msm8960) -libmm-venc-def += -DMAX_RES_1080P -libmm-venc-def += -DMAX_RES_1080P_EBI -libmm-venc-def += -UENABLE_GET_SYNTAX_HDR -endif -ifeq ($(TARGET_BOARD_PLATFORM),msm8974) -libmm-venc-def += -DMAX_RES_1080P -libmm-venc-def += -DMAX_RES_1080P_EBI -libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT -libmm-venc-def += -D_MSM8974_ -endif -ifeq ($(TARGET_BOARD_PLATFORM),msm7627a) -libmm-venc-def += -DMAX_RES_720P -endif -ifeq ($(TARGET_BOARD_PLATFORM),msm7630_surf) -libmm-venc-def += -DMAX_RES_720P -endif -ifeq ($(TARGET_BOARD_PLATFORM),msm8610) -libmm-venc-def += -DMAX_RES_720P -libmm-venc-def += -D_MSM8974_ -endif -ifeq ($(TARGET_BOARD_PLATFORM),msm8226) -libmm-venc-def += -DMAX_RES_1080P -libmm-venc-def += -D_MSM8974_ -endif -ifeq ($(TARGET_BOARD_PLATFORM),apq8084) -libmm-venc-def += -DMAX_RES_1080P -libmm-venc-def += -DMAX_RES_1080P_EBI -libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT -libmm-venc-def += -D_MSM8974_ -endif -ifeq ($(TARGET_BOARD_PLATFORM),mpq8092) -libmm-venc-def += -DMAX_RES_1080P -libmm-venc-def += -DMAX_RES_1080P_EBI -libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT -libmm-venc-def += -D_MSM8974_ -endif - -ifeq ($(TARGET_USES_ION),true) -libmm-venc-def += -DUSE_ION -endif - -libmm-venc-def += -D_ANDROID_ICS_ -# --------------------------------------------------------------------------------- -# Make the Shared library (libOmxVenc) -# --------------------------------------------------------------------------------- - -include $(CLEAR_VARS) - -libmm-venc-inc := bionic/libc/include -libmm-venc-inc += bionic/libstdc++/include -libmm-venc-inc += $(LOCAL_PATH)/inc -libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc -libmm-venc-inc += hardware/qcom/media/mm-core/inc -libmm-venc-inc += hardware/qcom/media/libstagefrighthw -libmm-venc-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libgralloc -libmm-venc-inc += frameworks/native/include/media/hardware -libmm-venc-inc += frameworks/native/include/media/openmax -libmm-venc-inc += hardware/qcom/media/libc2dcolorconvert -libmm-venc-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libcopybit -libmm-venc-inc += frameworks/av/include/media/stagefright -libmm-venc-inc += frameworks/av/include/media/hardware -libmm-venc-inc += $(venc-inc) - -LOCAL_MODULE := libOmxVenc -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := $(libmm-venc-def) -LOCAL_C_INCLUDES := $(libmm-venc-inc) - -LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \ - libc2dcolorconvert libdl - -LOCAL_SRC_FILES := src/omx_video_base.cpp -LOCAL_SRC_FILES += src/omx_video_encoder.cpp -ifneq ($(filter msm8974 msm8610 msm8226 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) -LOCAL_SRC_FILES += src/video_encoder_device_v4l2.cpp -else -LOCAL_SRC_FILES += src/video_encoder_device.cpp -endif - -LOCAL_SRC_FILES += ../common/src/extra_data_handler.cpp - -include $(BUILD_SHARED_LIBRARY) - -# ----------------------------------------------------------------------------- -# # Make the apps-test (mm-venc-omx-test720p) -# ----------------------------------------------------------------------------- - -include $(CLEAR_VARS) - -mm-venc-test720p-inc := $(TARGET_OUT_HEADERS)/mm-core -mm-venc-test720p-inc += $(LOCAL_PATH)/inc -mm-venc-test720p-inc += $(OMX_VIDEO_PATH)/vidc/common/inc -mm-venc-test720p-inc += hardware/qcom/media/mm-core/inc -mm-venc-test720p-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libgralloc -mm-venc-test720p-inc += $(venc-inc) - -LOCAL_MODULE := mm-venc-omx-test720p -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := $(libmm-venc-def) -LOCAL_C_INCLUDES := $(mm-venc-test720p-inc) -LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES := libmm-omxcore libOmxVenc libbinder liblog - -LOCAL_SRC_FILES := test/venc_test.cpp -LOCAL_SRC_FILES += test/camera_test.cpp -LOCAL_SRC_FILES += test/venc_util.c -LOCAL_SRC_FILES += test/fb_test.c - -include $(BUILD_EXECUTABLE) - -# ----------------------------------------------------------------------------- -# Make the apps-test (mm-video-driver-test) -# ----------------------------------------------------------------------------- - -include $(CLEAR_VARS) - -venc-test-inc += $(LOCAL_PATH)/inc -venc-test-inc += hardware/qcom/display/$(TARGET_BOARD_PLATFORM)/libgralloc -venc-test-inc += $(venc-inc) - -LOCAL_MODULE := mm-video-encdrv-test -LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(venc-test-inc) -LOCAL_C_INCLUDES += hardware/qcom/media/mm-core/inc - -LOCAL_PRELINK_MODULE := false - -LOCAL_SRC_FILES := test/video_encoder_test.c -LOCAL_SRC_FILES += test/queue.c - -include $(BUILD_EXECUTABLE) - -endif #BUILD_TINY_ANDROID - -# --------------------------------------------------------------------------------- -# END -# --------------------------------------------------------------------------------- -- cgit v1.2.3