diff options
| author | Aparna Mallavarapu <aparnam@codeaurora.org> | 2013-05-23 17:01:03 +0530 |
|---|---|---|
| committer | Aparna Mallavarapu <aparnam@codeaurora.org> | 2013-07-01 00:48:41 -0700 |
| commit | 5f119b0bda3269ccad9f9db50f04b94d7d404f62 (patch) | |
| tree | 2ff9ad4bf2839d09b7a0c40719ddbaba03f38cd4 | |
| parent | 462dfc05f605cb10484fa341b2c5d79d879a9253 (diff) | |
| download | android_hardware_qcom_media-5f119b0bda3269ccad9f9db50f04b94d7d404f62.tar.gz android_hardware_qcom_media-5f119b0bda3269ccad9f9db50f04b94d7d404f62.tar.bz2 android_hardware_qcom_media-5f119b0bda3269ccad9f9db50f04b94d7d404f62.zip | |
media: Add support for MPQ8092.
Add initial support for MPQ8092 bringup.
Change-Id: I379693f99974db2759f9105ee40482bdeec53c74
| -rw-r--r-- | Android.mk | 8 | ||||
| -rwxr-xr-x | mm-video/vidc/vdec/Android.mk | 11 | ||||
| -rw-r--r-- | mm-video/vidc/venc/Android.mk | 8 |
3 files changed, 19 insertions, 8 deletions
@@ -1,18 +1,18 @@ QCOM_MEDIA_ROOT := $(call my-dir) -ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092,$(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,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7630_surf apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-video/Android.mk endif -ifneq ($(filter msm8610 msm8226 msm8974 msm8960 apq8084,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk endif -ifneq ($(filter msm8974 msm8960 msm8226 apq8084,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8974 msm8960 msm8226 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/QCMediaPlayer/Android.mk include $(QCOM_MEDIA_ROOT)/dashplayer/Android.mk endif diff --git a/mm-video/vidc/vdec/Android.mk b/mm-video/vidc/vdec/Android.mk index d6840c93..be7d5797 100755 --- a/mm-video/vidc/vdec/Android.mk +++ b/mm-video/vidc/vdec/Android.mk @@ -66,7 +66,12 @@ 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) @@ -116,7 +121,7 @@ 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 -ifeq ($(call is-board-platform-in-list,msm8974 msm8610 msm8226 apq8084),true) +ifeq ($(call is-board-platform-in-list,msm8974 msm8610 msm8226 apq8084 mpq8092),true) LOCAL_SRC_FILES += src/omx_vdec_msm8974.cpp else LOCAL_SHARED_LIBRARIES += libhardware @@ -139,7 +144,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_PATH:= $(ROOT_DIR) -ifeq ($(call is-board-platform-in-list,msm8974 msm8610 apq8084),true) +ifeq ($(call is-board-platform-in-list,msm8974 msm8610 apq8084 mpq8092),true) LOCAL_MODULE := libOmxVdecHevc LOCAL_MODULE_TAGS := optional diff --git a/mm-video/vidc/venc/Android.mk b/mm-video/vidc/venc/Android.mk index 9edec22a..cb3429ae 100644 --- a/mm-video/vidc/venc/Android.mk +++ b/mm-video/vidc/venc/Android.mk @@ -56,6 +56,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),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 @@ -95,7 +101,7 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \ LOCAL_SRC_FILES := src/omx_video_base.cpp LOCAL_SRC_FILES += src/omx_video_encoder.cpp -ifeq ($(call is-board-platform-in-list,msm8974 msm8610 msm8226 apq8084),true) +ifeq ($(call is-board-platform-in-list,msm8974 msm8610 msm8226 apq8084 mpq8092),true) LOCAL_SRC_FILES += src/video_encoder_device_v4l2.cpp else LOCAL_SRC_FILES += src/video_encoder_device.cpp |