diff --git a/audio/audio_io_policy.conf b/audio/audio_io_policy.conf index e74eff8..4329392 100644 --- a/audio/audio_io_policy.conf +++ b/audio/audio_io_policy.conf @@ -11,9 +11,7 @@ # the flags and formats should match the ones in "audio_policy.conf" outputs { -#ifdef VENDOR_EDIT -#if OP_FEATURE_MM_24BIT == 1 -#liuhaituo@MM.Audio, 2019/07/15, use 24bit to playback +#wangchengqiang@MM.Audio, 2021/02/05, use 24bit to playback default { flags AUDIO_OUTPUT_FLAG_PRIMARY formats AUDIO_FORMAT_PCM_24_BIT_PACKED @@ -21,7 +19,6 @@ outputs { bit_width 24 app_type 69937 } -#else # default { # flags AUDIO_OUTPUT_FLAG_PRIMARY # formats AUDIO_FORMAT_PCM_16_BIT @@ -29,8 +26,6 @@ outputs { # bit_width 16 # app_type 69937 # } -#endif -#endif proaudio { flags AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW formats AUDIO_FORMAT_PCM_16_BIT @@ -45,26 +40,21 @@ outputs { bit_width 16 app_type 69946 } -#ifdef VENDOR_EDIT -#if OP_FEATURE_MM_24BIT == 1 -#liuhaituo@MM.Audio, 2019/07/15, use 24bit to playback - deep_buffer { - flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER - formats AUDIO_FORMAT_PCM_24_BIT_PACKED - sampling_rates 48000 - bit_width 24 - app_type 69936 - } -#else +#wangchengqiang@MM.Audio, 2021/02/05, use 24bit to playback # deep_buffer { # flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER -# formats AUDIO_FORMAT_PCM_16_BIT +# formats AUDIO_FORMAT_PCM_24_BIT_PACKED # sampling_rates 48000 -# bit_width 16 +# bit_width 24 # app_type 69936 # } -#endif -#endif + deep_buffer { + flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69936 + } direct_pcm_16 { flags AUDIO_OUTPUT_FLAG_DIRECT formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT @@ -112,12 +102,9 @@ outputs { inputs { record_16bit { formats AUDIO_FORMAT_PCM_16_BIT - #ifndef VENDOR_EDIT - #yewenliang@MM.Audio, 2020/04/09, remove 11025 series sample rate for normal record + #wangchengqiang@MM.Audio,20210127,remove 44.1k 88.2k 176.4k 192k for normal record #sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000 - #else - sampling_rates 8000|16000|32000|48000|96000|192000 - #endif + sampling_rates 8000|16000|32000|48000 bit_width 16 app_type 69938 } @@ -133,4 +120,41 @@ inputs { bit_width 32 app_type 69949 } + record_compress_16 { + flags AUDIO_INPUT_FLAG_COMPRESS + formats AUDIO_FORMAT_PCM_16_BIT + #wangchengqiang@MM.Audio,20210127,remove 44.1k 88.2k 176.4k 192k for compress record + #sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000 + sampling_rates 8000|16000|32000|48000 + bit_width 16 + app_type 69938 + } + record_compress_24 { + flags AUDIO_INPUT_FLAG_COMPRESS + formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT + sampling_rates 44100|48000|88200|96000|176400|192000 + bit_width 24 + app_type 69948 + } + record_compress_32 { + flags AUDIO_INPUT_FLAG_COMPRESS + formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT + sampling_rates 44100|48000|88200|96000|176400|192000 + bit_width 32 + app_type 69949 + } + voip_tx { + flags AUDIO_INPUT_FLAG_VOIP_TX + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 8000|16000|32000|48000 + bit_width 16 + app_type 69946 + } + low_latency_voip_tx { + flags AUDIO_INPUT_FLAG_FAST|AUDIO_INPUT_FLAG_VOIP_TX + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69946 + } } diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index 85c9b5d..e04dac3 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -1,5 +1,5 @@ - + + + + diff --git a/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml b/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml new file mode 100644 index 0000000..7707ae1 --- /dev/null +++ b/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/common.mk b/common.mk index 8e41773..ddc8874 100644 --- a/common.mk +++ b/common.mk @@ -152,12 +152,12 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \ - $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml + $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + $(LOCAL_PATH)/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml PRODUCT_COPY_FILES += \ frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml @@ -311,9 +311,15 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ $(LOCAL_PATH)/configs/media_codecs_lito.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_lito.xml \ $(LOCAL_PATH)/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ + $(LOCAL_PATH)/configs/media_codecs_performance_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_v1.xml \ + $(LOCAL_PATH)/configs/media_codecs_performance_lagoon_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_lagoon_v0.xml \ + $(LOCAL_PATH)/configs/media_codecs_performance_lagoon_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_lagoon_v1.xml \ $(LOCAL_PATH)/configs/media_codecs_performance_lito.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_lito.xml \ $(LOCAL_PATH)/configs/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor.xml \ + $(LOCAL_PATH)/configs/media_codecs_vendor_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_v1.xml \ $(LOCAL_PATH)/configs/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \ + $(LOCAL_PATH)/configs/media_codecs_vendor_lagoon_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_lagoon_v0.xml \ + $(LOCAL_PATH)/configs/media_codecs_vendor_lagoon_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_lagoon_v1.xml \ $(LOCAL_PATH)/configs/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ $(LOCAL_PATH)/configs/media_profiles_lito.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_lito.xml \ $(LOCAL_PATH)/configs/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml \ diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml index fa3cb5c..699f935 100644 --- a/configs/media_codecs.xml +++ b/configs/media_codecs.xml @@ -78,107 +78,54 @@ Only the three quirks included above are recognized at this point: a texture and possibly other code, so just DON'T USE THIS QUIRK. ---> - - @@ -193,80 +140,59 @@ Only the three quirks included above are recognized at this point: - + - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + - - - - - + + + + + - - - + - - - + - + @@ -274,33 +200,27 @@ Only the three quirks included above are recognized at this point: - + - - - - + - - - @@ -308,45 +228,41 @@ Only the three quirks included above are recognized at this point: - + - - - - + + + - - - - - - + + + + - + - - + - - + + + - + - @@ -357,10 +273,9 @@ Only the three quirks included above are recognized at this point: - + - @@ -369,116 +284,90 @@ Only the three quirks included above are recognized at this point: - - - - - - - - - - - - - - - - - + - - + - + - - - - - - + + + + - + - - + - - + + + - + - - - - + + + - - - - - - + + + + - + - - + - - + + + - + - - - - + - diff --git a/configs/media_codecs_lito.xml b/configs/media_codecs_lito.xml index e67dfc4..699f935 100644 --- a/configs/media_codecs_lito.xml +++ b/configs/media_codecs_lito.xml @@ -78,115 +78,58 @@ Only the three quirks included above are recognized at this point: a texture and possibly other code, so just DON'T USE THIS QUIRK. ---> - - - - - - @@ -197,80 +140,59 @@ Only the three quirks included above are recognized at this point: - + - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + - - - - - + + + + + - - - + - - - + - + @@ -278,33 +200,27 @@ Only the three quirks included above are recognized at this point: - + - - - - + - - - @@ -312,45 +228,41 @@ Only the three quirks included above are recognized at this point: - + - - - - + + + - - - - - - + + + + - + - - + - - + + + - + - @@ -361,10 +273,9 @@ Only the three quirks included above are recognized at this point: - + - @@ -373,122 +284,97 @@ Only the three quirks included above are recognized at this point: - - - - - - - - - - - - - - - - - + - - + - + - - - - - - + + + + - + - - + - - + + + - + - - - - + + + - - - - - - + + + + - + - - + - - + + + - + - - - - + - + diff --git a/configs/media_codecs_performance.xml b/configs/media_codecs_performance.xml index a8ae2eb..e4e44d4 100644 --- a/configs/media_codecs_performance.xml +++ b/configs/media_codecs_performance.xml @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/media_codecs_performance_lagoon_v1.xml b/configs/media_codecs_performance_lagoon_v1.xml new file mode 100644 index 0000000..da92aea --- /dev/null +++ b/configs/media_codecs_performance_lagoon_v1.xml @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/media_codecs_performance_lito.xml b/configs/media_codecs_performance_lito.xml index a8ae2eb..e4e44d4 100644 --- a/configs/media_codecs_performance_lito.xml +++ b/configs/media_codecs_performance_lito.xml @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/media_codecs_vendor.xml b/configs/media_codecs_vendor.xml index e67dfc4..705f3cd 100644 --- a/configs/media_codecs_vendor.xml +++ b/configs/media_codecs_vendor.xml @@ -78,115 +78,63 @@ Only the three quirks included above are recognized at this point: a texture and possibly other code, so just DON'T USE THIS QUIRK. ---> - - - - - @@ -197,80 +145,75 @@ Only the three quirks included above are recognized at this point: - + - - - - - - - + + + + + - - + + - + - - - - + + + - - + + + + - + - - - - + + + + - - + + - - + + - - - + - - - + - + @@ -278,33 +221,27 @@ Only the three quirks included above are recognized at this point: - + - - - - + - - - @@ -312,46 +249,41 @@ Only the three quirks included above are recognized at this point: - + - - - - + + + - - - - - - + + + + - + - - + + - - + - - + @@ -361,11 +293,10 @@ Only the three quirks included above are recognized at this point: - + - - + @@ -376,113 +307,101 @@ Only the three quirks included above are recognized at this point: - + - - + - + - + - + + - + - - + - + - - - - - - + + + + - + - - + + - - + - - - - + + + - - - - - - + + + + - + - - + + - - + - - - - + - diff --git a/configs/media_codecs_vendor_lagoon_v0.xml b/configs/media_codecs_vendor_lagoon_v0.xml new file mode 100644 index 0000000..689bcd0 --- /dev/null +++ b/configs/media_codecs_vendor_lagoon_v0.xml @@ -0,0 +1,368 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/media_codecs_vendor_lagoon_v1.xml b/configs/media_codecs_vendor_lagoon_v1.xml new file mode 100644 index 0000000..21815f3 --- /dev/null +++ b/configs/media_codecs_vendor_lagoon_v1.xml @@ -0,0 +1,371 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/media_codecs_vendor_v1.xml b/configs/media_codecs_vendor_v1.xml new file mode 100644 index 0000000..3a84d8d --- /dev/null +++ b/configs/media_codecs_vendor_v1.xml @@ -0,0 +1,409 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml index 66128d6..56a2286 100644 --- a/configs/media_profiles.xml +++ b/configs/media_profiles.xml @@ -1,5 +1,7 @@ - + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -210,108 +451,340 @@ - + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -319,132 +792,307 @@ + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -453,107 +1101,358 @@ + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -561,132 +1460,359 @@ + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -695,107 +1821,358 @@ + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -813,40 +2190,54 @@ 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="120" /> + minFrameRate="15" maxFrameRate="30" + maxHFRFrameWidth="0" maxHFRFrameHeight="0" + maxHFRMode="0" /> + minBitRate="64000" maxBitRate="8000000" + minFrameWidth="176" maxFrameWidth="800" + minFrameHeight="144" maxFrameHeight="480" + minFrameRate="15" maxFrameRate="30" + maxHFRFrameWidth="0" maxHFRFrameHeight="0" + maxHFRMode="0" /> + + + minChannels="1" maxChannels="6" /> + minChannels="1" maxChannels="1" /> + minChannels="1" maxChannels="1" /> @@ -855,6 +2246,11 @@ minSampleRate="8000" maxSampleRate="8000" minChannels="1" maxChannels="1" /> + + - - + + + + + + + + + + + + diff --git a/configs/media_profiles_lito.xml b/configs/media_profiles_lito.xml index 3d95410..add036f 100644 --- a/configs/media_profiles_lito.xml +++ b/configs/media_profiles_lito.xml @@ -27,7 +27,7 @@ - + @@ -110,7 +110,7 @@ - - - - - - - - - - - - - - - - + + + + + + + - - - - +