diff options
author | Aaron Ding <aaronding@google.com> | 2018-06-13 18:38:47 +0800 |
---|---|---|
committer | Aaron Ding <aaronding@google.com> | 2018-06-14 13:34:23 +0800 |
commit | e54adea68e0d2a7915e76ea06a6ff7ff6f427736 (patch) | |
tree | 8f1ab93ac1e00ac5eb070e58750879574d97c85b /mm-video-v4l2/vidc | |
parent | 7b1cf3d5ea629cef369edd3af41da88ced5bfb5c (diff) | |
parent | 1e0535e3ef63015a4585c5f5fbc8fd7644f90dbd (diff) | |
download | media-e54adea68e0d2a7915e76ea06a6ff7ff6f427736.tar.gz |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.376' into pi-dev
Bug: 110126338
Change-Id: Icb2be3e7de033c894ec427db684a577e50b5d6af
Diffstat (limited to 'mm-video-v4l2/vidc')
-rwxr-xr-x | mm-video-v4l2/vidc/vdec/Android.mk | 4 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index b0026bf2..3f8fa799 100755 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -24,8 +24,8 @@ libmm-vdec-def += -D_ANDROID_ICS_ libmm-vdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT TARGETS_THAT_HAVE_VENUS_HEVC := apq8084 msm8994 msm8996 -TARGETS_THAT_SUPPORT_UBWC := msm8996 msm8953 msm8998 sdm660 sdm845 msmpeafowl sdm670 qcs605 -TARGETS_THAT_NEED_SW_VDEC := msm8937 sdm845 msmpeafowl sdm670 qcs605 +TARGETS_THAT_SUPPORT_UBWC := msm8996 msm8953 msm8998 sdm660 sdm845 msmpeafowl sdm710 qcs605 +TARGETS_THAT_NEED_SW_VDEC := msm8937 sdm845 msmpeafowl sdm710 qcs605 ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_HAVE_VENUS_HEVC)),true) libmm-vdec-def += -DVENUS_HEVC diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index 700b5b4c..d1e5af1b 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -21,11 +21,11 @@ libmm-venc-def += -Werror libmm-venc-def += -D_ANDROID_ICS_ TARGETS_THAT_USE_FLAG_MSM8226 := msm8226 msm8916 msm8909 -TARGETS_THAT_NEED_SW_VENC_MPEG4 := msm8909 msm8937 sdm845 msmpeafowl sdm670 qcs605 +TARGETS_THAT_NEED_SW_VENC_MPEG4 := msm8909 msm8937 sdm845 msmpeafowl sdm710 qcs605 TARGETS_THAT_NEED_SW_VENC_HEVC := msm8992 -TARGETS_THAT_SUPPORT_UBWC := msm8996 msm8998 sdm845 msmpeafowl sdm670 qcs605 +TARGETS_THAT_SUPPORT_UBWC := msm8996 msm8998 sdm845 msmpeafowl sdm710 qcs605 TARGETS_THAT_SUPPORT_VQZIP := msm8996 msm8998 -TARGETS_THAT_SUPPORT_SW_VENC_ROTATION := sdm845 msmpeafowl sdm670 qcs605 +TARGETS_THAT_SUPPORT_SW_VENC_ROTATION := sdm845 msmpeafowl sdm710 qcs605 ifeq ($(TARGET_BOARD_PLATFORM),msm8610) libmm-venc-def += -D_MSM8610_ |