From aeb71c6b1c6f2f3bf6ae32a177ec282500dca285 Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 29 Aug 2024 11:15:28 +0000 Subject: [PATCH] audio: update AIDL configs and add spatializer configs Bug: 362904466 Test: mm Flag: build.RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA Change-Id: I89c275233d9d52853a9e57ea7db4ae9b43af3c7e --- audio/akita/aidl_config/Android.bp | 63 + .../audio_platform_configuration.xml | 112 ++ .../aidl_config/audio_policy_volumes.xml | 265 +++ audio/akita/aidl_config/mixer_paths_aidl.xml | 1507 +++++++++++++++++ audio/akita/audio-tables.mk | 17 + audio/akita/tuning/spatializer/base | Bin 0 -> 3912 bytes audio/akita/tuning/spatializer/mode_2_ch | Bin 0 -> 916 bytes audio/akita/tuning/spatializer/mode_6_ch | Bin 0 -> 784 bytes audio/akita/tuning/spatializer/mode_xaural | Bin 0 -> 32 bytes device-akita.mk | 17 + 10 files changed, 1981 insertions(+) create mode 100644 audio/akita/aidl_config/Android.bp create mode 100644 audio/akita/aidl_config/audio_platform_configuration.xml create mode 100644 audio/akita/aidl_config/audio_policy_volumes.xml create mode 100644 audio/akita/aidl_config/mixer_paths_aidl.xml create mode 100644 audio/akita/tuning/spatializer/base create mode 100644 audio/akita/tuning/spatializer/mode_2_ch create mode 100644 audio/akita/tuning/spatializer/mode_6_ch create mode 100644 audio/akita/tuning/spatializer/mode_xaural diff --git a/audio/akita/aidl_config/Android.bp b/audio/akita/aidl_config/Android.bp new file mode 100644 index 0000000..630183f --- /dev/null +++ b/audio/akita/aidl_config/Android.bp @@ -0,0 +1,63 @@ +// Copyright (C) 2024 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +soong_namespace { + imports: [ + "frameworks/av/services/audiopolicy/config", + ], +} + +package { + default_applicable_licenses: [ + "Android-Apache-2.0", + ], +} + +prebuilt_etc { + name: "audio_policy_volumes.xml", + src: "audio_policy_volumes.xml", + soc_specific: true, +} + +prebuilt_etc { + name: "imported_default_volume_tables.xml", + src: "//frameworks/av/services/audiopolicy/config:default_volume_tables.xml", + soc_specific: true, + filename_from_src: true, +} + +prebuilt_etc { + name: "audio_platform_configuration.xml", + src: "audio_platform_configuration.xml", + soc_specific: true, + required: [ + "audio_policy_volumes.xml", + "imported_default_volume_tables.xml", + ], +} + +prebuilt_etc { + name: "mixer_paths_aidl.xml", + src: "mixer_paths_aidl.xml", + soc_specific: true, +} + +phony { + name: "audio_aidl_configs", + soc_specific: true, + required: [ + "audio_platform_configuration.xml", + "mixer_paths_aidl.xml", + ], +} diff --git a/audio/akita/aidl_config/audio_platform_configuration.xml b/audio/akita/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..f864b87 --- /dev/null +++ b/audio/akita/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 0.01 + 0.02 + 0.04 + 0.10 + 0.21 + 0.47 + 1.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MIC + CAMCORDER + + + MIC + CAMCORDER + + + + + + diff --git a/audio/akita/aidl_config/audio_policy_volumes.xml b/audio/akita/aidl_config/audio_policy_volumes.xml new file mode 100644 index 0000000..8a138a0 --- /dev/null +++ b/audio/akita/aidl_config/audio_policy_volumes.xml @@ -0,0 +1,265 @@ + + + + + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-5200 + 13,-5000 + 28,-4400 + 56,-3380 + 71,-3120 + 85,-2750 + 100,-2150 + + + + + + + 1,-4935 + 14,-3320 + 28,-2960 + 71,-1400 + 100,0 + + + + + + + 1,-6920 + 4,-6920 + 8,-6664 + 12,-6374 + 16,-6082 + 20,-5759 + 24,-5410 + 28,-5038 + 32,-4807 + 36,-4577 + 40,-4339 + 44,-4132 + 48,-3860 + 52,-3569 + 56,-3223 + 60,-2823 + 64,-2452 + 68,-2078 + 72,-1795 + 76,-1561 + 80,-1226 + 84,-956 + 88,-789 + 92,-635 + 96,-505 + 100,0 + + + + + + + 0,-5600 + 14,-4670 + 28,-3060 + 71,-1050 + 100,-100 + + + + + + + 1,-6350 + 14,-4300 + 28,-3710 + 66,-2100 + 85,-1550 + 100,-780 + + + + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-5200 + 13,-5000 + 28,-4400 + 56,-3380 + 71,-3120 + 85,-2750 + 100,-2150 + + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-6600 + 13,-6220 + 28,-5500 + 42,-4600 + 57,-4250 + 100,-2780 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/akita/aidl_config/mixer_paths_aidl.xml b/audio/akita/aidl_config/mixer_paths_aidl.xml new file mode 100644 index 0000000..8943c9e --- /dev/null +++ b/audio/akita/aidl_config/mixer_paths_aidl.xml @@ -0,0 +1,1507 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/akita/audio-tables.mk b/audio/akita/audio-tables.mk index 65242e8..e18e4aa 100644 --- a/audio/akita/audio-tables.mk +++ b/audio/akita/audio-tables.mk @@ -16,6 +16,11 @@ AUDIO_TABLE_FOLDER := akita +ifeq ($(USE_AUDIO_HAL_AIDL),true) +PRODUCT_SOONG_NAMESPACES += device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/aidl_config +PRODUCT_PACKAGES += audio_aidl_configs + +else # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ @@ -27,6 +32,8 @@ PRODUCT_COPY_FILES += \ device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml +endif + # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml @@ -76,3 +83,13 @@ PRODUCT_COPY_FILES += \ device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps endif + +ifeq ($(USE_AUDIO_HAL_AIDL),true) +# Offload spatializer config +PRODUCT_COPY_FILES += \ + device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \ + device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \ + device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \ + device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \ + +endif diff --git a/audio/akita/tuning/spatializer/base b/audio/akita/tuning/spatializer/base new file mode 100644 index 0000000000000000000000000000000000000000..38cc646e1f4db548866aac2bb32c0836467df2ba GIT binary patch literal 3912 zcmai%J8l#~5Qb|X-u2sFKM(UgMU-z`PUG8p=H0HSEb>h##uY0sr9*hd>Csm|Cg5Ve0&FAxr4K8 zEB^EjPVPIpZLnMP2cs@>|8sqv^!vZ9=dg4Ae4e>|p6p@RqRKw7276swX9JY+^}Xdf zbLq(sV}hUledaZt*9HE{hVi`IFI7}u z*KpQpaq6$c(V0(}s^*OQUwk=(c_U`Rd`+4;F>g$)s_F*);`t$L9m>=t_vptRb_V@SIvPKp`Gdm08 z;&1c9W_>(j@~*j-K2$k9PjwLeMIDX2{CG6_q1Vxvc5xqu0^si(U`CvY=C2u8*R z9|!H`Z^pv-KZoS&zrE7?k9DIC4p(iY8c00W-?Y%*rlEHblJ(O#&al@wgI?ndd5yE< zwT(=RUOPMJHOAso*BKu2UPuidA0IzUc_c>PsxiF76zU?Q0i}maxBvhE literal 0 HcmV?d00001 diff --git a/audio/akita/tuning/spatializer/mode_2_ch b/audio/akita/tuning/spatializer/mode_2_ch new file mode 100644 index 0000000000000000000000000000000000000000..470c56cfb061951dd4509b49cfaa8391751f1c52 GIT binary patch literal 916 zcmZ`%Jxjzu5S@JMdFlmH93pDvR~sx36A^9v0k$^F`7crl7Iro#f>zquoQS1Z@BIS{ zOMifsc;cJvE`;6O!eln{Uf#UjNlHY0L`Vf?XIEov>*c9brN~``M+pVMx!$aWEwxDN zGV7AVCVQEMv6opGdr_Di*gn~djhPuP0^_q^+}p;mrTU(SLIix5oc{qUB7Cs` literal 0 HcmV?d00001 diff --git a/audio/akita/tuning/spatializer/mode_6_ch b/audio/akita/tuning/spatializer/mode_6_ch new file mode 100644 index 0000000000000000000000000000000000000000..94ec6356a9895665cd1dde568bbc5282d341ac0a GIT binary patch literal 784 zcmZ`%J5Iwu6deDE2u5HjMGBIzTb{4@V5o{X4 zE(X|)`Wb3SBj+C2JocV?PCmsn&F9{8@+9 cZvVX2IZ^2;rt=)?*n6*0b?0JkYTn!QA9vGakpKVy literal 0 HcmV?d00001 diff --git a/audio/akita/tuning/spatializer/mode_xaural b/audio/akita/tuning/spatializer/mode_xaural new file mode 100644 index 0000000000000000000000000000000000000000..b3a3a962e37c8aca8a8d1710f622c24f28343c56 GIT binary patch literal 32 dcmWe+U|^5{VipDm29d