From f63f6cbb464e19ac8c8f65f62a30ad5482ce39f4 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Sat, 8 Sep 2018 12:50:26 +0800 Subject: wayne-common: Tweak media profiles * Remove unsupported profiles in AOSP from media_profiles_vendor.xml: - vga - 4kdci - timelapsevga - timelapse4kdci - highspeedcif - highspeedvga - highspeed4kdci - qhd - 2k - timelapseqhd - timelapse2k - lpcm and use it as media_profiles_V1_0.xml * Remove never used CAF media_profiles_V1_0.xml. Change-Id: I8309af0804caf32ab0870a7ad754b8d41dc9b544 Signed-off-by: Isaac Chen --- configs/media_profiles_V1_0.xml | 1275 +++++++++++++++++++++++++++++-------- configs/media_profiles_vendor.xml | 1189 ---------------------------------- wayne.mk | 3 +- 3 files changed, 1011 insertions(+), 1456 deletions(-) delete mode 100644 configs/media_profiles_vendor.xml diff --git a/configs/media_profiles_V1_0.xml b/configs/media_profiles_V1_0.xml index 0935bbc..f656ced 100644 --- a/configs/media_profiles_V1_0.xml +++ b/configs/media_profiles_V1_0.xml @@ -1,11 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -339,27 +1070,41 @@ or query the capabilities of the codec at all if it is disabled --> + minBitRate="64000" maxBitRate="42000000" + minFrameWidth="176" maxFrameWidth="4096" + minFrameHeight="144" maxFrameHeight="2160" + minFrameRate="15" maxFrameRate="30" + maxHFRFrameWidth="1920" maxHFRFrameHeight="1080" + maxHFRMode="60" /> + minFrameRate="15" maxFrameRate="30" + maxHFRFrameWidth="0" maxHFRFrameHeight="0" + maxHFRMode="0" /> + minFrameHeight="144" maxFrameHeight="1088" + minFrameRate="15" maxFrameRate="30" + maxHFRFrameWidth="0" maxHFRFrameHeight="0" + maxHFRMode="0" /> + + + minChannels="1" maxChannels="6" /> @@ -388,8 +1133,8 @@ for TEST applications. For other applications, we do not perform any checks at all. --> - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wayne.mk b/wayne.mk index edd1d77..5b34a68 100644 --- a/wayne.mk +++ b/wayne.mk @@ -298,8 +298,7 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ $(COMMON_PATH)/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ - $(COMMON_PATH)/configs/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ - $(COMMON_PATH)/configs/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml + $(COMMON_PATH)/configs/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml PRODUCT_COPY_FILES += \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ -- cgit v1.2.3