diff options
author | Marcos Marado <mmarado@cyngn.com> | 2014-12-16 19:31:32 +0000 |
---|---|---|
committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2014-12-22 17:00:18 +0000 |
commit | c8b6d5ceaf831f7b0ba551687eaa099b05cdb156 (patch) | |
tree | 241be726552662a9f6c14b8a23fe7ae4262e5272 | |
parent | 9df59e4c741385b0a01b3e59928306cce1974b19 (diff) | |
download | android_hardware_qcom_media-c8b6d5ceaf831f7b0ba551687eaa099b05cdb156.tar.gz android_hardware_qcom_media-c8b6d5ceaf831f7b0ba551687eaa099b05cdb156.tar.bz2 android_hardware_qcom_media-c8b6d5ceaf831f7b0ba551687eaa099b05cdb156.zip |
CM12vification
Change-Id: I648f47fa681c1720aac62e83844d2c901c31b58f
-rw-r--r-- | Android.mk | 4 | ||||
-rw-r--r-- | mm-core/inc/QCMetaData.h | 4 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/common/Android.mk | 4 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 6 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 6 | ||||
-rw-r--r-- | videopp/Android.mk | 2 |
6 files changed, 16 insertions, 10 deletions
@@ -1,3 +1,4 @@ +ifeq ($(call my-dir),$(call project-path-for,qcom-media)) QCOM_MEDIA_ROOT := $(call my-dir) $(warning target list is : $(MSM_VIDC_TARGET_LIST)) @@ -7,7 +8,7 @@ include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk endif -ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)),true) +ifneq ($(filter msm8916 msm8939,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk @@ -16,3 +17,4 @@ include $(QCOM_MEDIA_ROOT)/videopp/Android.mk endif endif +endif diff --git a/mm-core/inc/QCMetaData.h b/mm-core/inc/QCMetaData.h index c4805e00..19cb5721 100644 --- a/mm-core/inc/QCMetaData.h +++ b/mm-core/inc/QCMetaData.h @@ -36,6 +36,7 @@ namespace android { enum { kKeyAacCodecSpecificData = 'nacc' , // for native aac files +#ifndef META_DATA_H_ //duplicated there kKeyRawCodecSpecificData = 'rcsd', // raw data - added to support mmParser kKeyDivXVersion = 'DivX', // int32_t kKeyDivXDrm = 'QDrm', // void * @@ -47,6 +48,7 @@ enum { kKeyWMAFormatTag = 'fmtt', // int64_t kKeyWMABitspersample = 'bsps', // int64_t kKeyWMAVirPktSize = 'vpks', // int64_t +#endif kKeyWMAChannelMask = 'chmk', // int32_t kKeyFileFormat = 'ffmt', // cstring @@ -74,6 +76,7 @@ enum { kKeyMd5Sum = 'md5s', //cstring }; +#ifndef META_DATA_H_ //duplicated there enum { kTypeDivXVer_3_11, kTypeDivXVer_4, @@ -85,6 +88,7 @@ enum { kTypeWMAPro, kTypeWMALossLess, }; +#endif //This enum should be keep in sync with "enum Flags" in MediaExtractor.h in AOSP, //Value should reflect as last entry in the enum diff --git a/mm-video-v4l2/vidc/common/Android.mk b/mm-video-v4l2/vidc/common/Android.mk index cea81fc9..827c3012 100644 --- a/mm-video-v4l2/vidc/common/Android.mk +++ b/mm-video-v4l2/vidc/common/Android.mk @@ -25,9 +25,9 @@ libmm-vidc-add-dep := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr # --------------------------------------------------------------------------------- libmm-vidc-inc := $(LOCAL_PATH)/inc -libmm-vidc-inc += $(TOP)/hardware/qcom/media/mm-core/inc +libmm-vidc-inc += $(TOP)/$(call project-path-for,qcom-media)/mm-core/inc libmm-vidc-inc += $(TARGET_OUT_HEADERS)/qcom/display -libmm-vidc-inc += $(TOP)/hardware/qcom/media/libc2dcolorconvert +libmm-vidc-inc += $(TOP)/$(call project-path-for,qcom-media)/libc2dcolorconvert libmm-vidc-inc += $(TOP)/frameworks/av/include/media/stagefright libmm-vidc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 9a64f4b8..7670b376 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -57,21 +57,21 @@ include $(CLEAR_VARS) # Common Includes libmm-vdec-inc := $(LOCAL_PATH)/inc libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc -libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-core/inc +libmm-vdec-inc += $(TOP)/$(call project-path-for,qcom-media)/mm-core/inc #DRM include - Interface which loads the DRM library libmm-vdec-inc += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno libmm-vdec-inc += $(TOP)/frameworks/native/include/media/openmax libmm-vdec-inc += $(TOP)/frameworks/native/include/media/hardware -libmm-vdec-inc += $(TOP)/hardware/qcom/media/libc2dcolorconvert +libmm-vdec-inc += $(TOP)/$(call project-path-for,qcom-media)/libc2dcolorconvert libmm-vdec-inc += $(TOP)/frameworks/av/include/media/stagefright libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/SwVdec libmm-vdec-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include ifeq ($(PLATFORM_SDK_VERSION), 18) #JB_MR2 libmm-vdec-def += -DANDROID_JELLYBEAN_MR2=1 -libmm-vdec-inc += $(TOP)/hardware/qcom/media/libstagefrighthw +libmm-vdec-inc += $(TOP)/$(call project-path-for,qcom-media)/libstagefrighthw endif # Common Dependencies diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index 85a05944..2f3564a1 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -48,13 +48,13 @@ endif # Common Includes 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 += $(call project-path-for,qcom-media)/mm-core/inc +libmm-venc-inc += $(call project-path-for,qcom-media)/libstagefrighthw libmm-venc-inc += $(TARGET_OUT_HEADERS)/qcom/display libmm-venc-inc += $(TARGET_OUT_HEADERS)/adreno 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 += $(call project-path-for,qcom-media)/libc2dcolorconvert libmm-venc-inc += frameworks/av/include/media/stagefright libmm-venc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include diff --git a/videopp/Android.mk b/videopp/Android.mk index 43440fdf..12471ee6 100644 --- a/videopp/Android.mk +++ b/videopp/Android.mk @@ -42,7 +42,7 @@ LOCAL_PATH:= $(ROOT_DIR) libmm-vidpp-inc += $(LOCAL_PATH)/inc libmm-vidpp-inc += $(OMX_VIDEO_PATH)/vidc/common/inc -libmm-vidpp-inc += hardware/qcom/media/mm-core/inc +libmm-vidpp-inc += $(call project-path-for,qcom-media)/mm-core/inc libmm-vidpp-inc += $(TARGET_OUT_HEADERS)/qcom/display libmm-vidpp-inc += frameworks/native/include/media/openmax libmm-vidpp-inc += frameworks/native/include/media/hardware |