diff options
| author | Sivalatha Chakrala <sivala@codeaurora.org> | 2013-12-12 23:39:59 +0530 |
|---|---|---|
| committer | Sivalatha Chakrala <sivala@codeaurora.org> | 2013-12-13 17:56:20 +0530 |
| commit | 9e6354b7289880f7bcad8acdde3cd764f07a0640 (patch) | |
| tree | 25407adc8e1b14ee138d9b2a729ce252843d9b67 | |
| parent | 240ffe2a1396050400df37d4a8ad142b8d8796d6 (diff) | |
| download | android_hardware_qcom_media-9e6354b7289880f7bcad8acdde3cd764f07a0640.tar.gz android_hardware_qcom_media-9e6354b7289880f7bcad8acdde3cd764f07a0640.tar.bz2 android_hardware_qcom_media-9e6354b7289880f7bcad8acdde3cd764f07a0640.zip | |
media: Add initial support for msm8916
Enable initial media support for msm8916 target.
Change-Id: Ie76ce1161dc07cebe8f2a470859b06c0b477d5c1
Conflicts:
Android.mk
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 11 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 8 |
3 files changed, 20 insertions, 7 deletions
@@ -1,18 +1,18 @@ QCOM_MEDIA_ROOT := $(call my-dir) -ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092 msm_bronze,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092 msm_bronze msm8916,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk endif -ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7630_surf apq8084 mpq8092 msm_bronze,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7630_surf apq8084 mpq8092 msm_bronze msm8916,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk endif -ifneq ($(filter msm8610 msm8226 msm8974 msm8960 apq8084 mpq8092 msm_bronze,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 apq8084 mpq8092 msm_bronze msm8916,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk endif -ifneq ($(filter msm8974 msm8960 msm8226 apq8084 mpq8092 msm8610 msm_bronze,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8974 msm8960 msm8226 apq8084 mpq8092 msm8610 msm_bronze msm8916,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/QCMediaPlayer/Android.mk include $(QCOM_MEDIA_ROOT)/dashplayer/Android.mk endif diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 5a0c5569..1ed23525 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -83,6 +83,13 @@ libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT libOmxVdec-def += -D_MSM8974_ libOmxVdec-def += -D_HEVC_USE_ADSP_HEAP_ endif +ifeq ($(TARGET_BOARD_PLATFORM),msm8916) +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 libOmxVdec-def += -D_ANDROID_ICS_ ifeq ($(TARGET_USES_ION),true) @@ -145,7 +152,7 @@ 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/hevc_utils.cpp -ifneq (,$(filter msm8974 msm8610 msm8226 apq8084 mpq8092 msm_bronze,$(TARGET_BOARD_PLATFORM))) +ifneq (,$(filter msm8974 msm8610 msm8226 apq8084 mpq8092 msm_bronze msm8916,$(TARGET_BOARD_PLATFORM))) LOCAL_SRC_FILES += src/omx_vdec_msm8974.cpp else LOCAL_SHARED_LIBRARIES += libhardware @@ -171,7 +178,7 @@ LOCAL_PATH:= $(ROOT_DIR) # libOmxVdecHevc library is not built for OSS builds as QCPATH is null in OSS builds. ifneq "$(wildcard $(QCPATH) )" "" -ifneq (,$(filter msm8974 msm8610 msm8226 msm_bronze,$(TARGET_BOARD_PLATFORM))) +ifneq (,$(filter msm8974 msm8610 msm8226 msm_bronze msm8916,$(TARGET_BOARD_PLATFORM))) LOCAL_MODULE := libOmxVdecHevc LOCAL_MODULE_TAGS := optional diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index 570dd0f1..777b2ab3 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -71,6 +71,12 @@ libmm-venc-def += -DMAX_RES_1080P_EBI libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT libmm-venc-def += -D_MSM8974_ endif +ifeq ($(TARGET_BOARD_PLATFORM),msm8916) +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 @@ -110,7 +116,7 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \ LOCAL_SRC_FILES := src/omx_video_base.cpp LOCAL_SRC_FILES += src/omx_video_encoder.cpp -ifneq (,$(filter msm8974 msm8610 msm8226 apq8084 mpq8092 msm_bronze,$(TARGET_BOARD_PLATFORM))) +ifneq (,$(filter msm8974 msm8610 msm8226 apq8084 mpq8092 msm_bronze msm8916,$(TARGET_BOARD_PLATFORM))) LOCAL_SRC_FILES += src/video_encoder_device_v4l2.cpp else LOCAL_SRC_FILES += src/video_encoder_device.cpp |