From 0d465cac83258e1e74ffa89a12d7c6377cbe5beb Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Thu, 29 Jun 2023 06:47:51 +0000 Subject: [PATCH] aidl: tangorpro: add audio table for aidl hal Test: end-to-end testing Bug: 289328594 Change-Id: If71b70057dd80136bc49df516c4d9bd5d9ed16e7 --- .../audio_platform_configuration_aidl.xml | 76 ++ .../aidl_config/audio_policy_volumes.xml | 227 ++++ .../aidl_config/mixer_paths_aidl.xml | 1077 +++++++++++++++++ audio/tangorpro/audio-tables.mk | 10 + 4 files changed, 1390 insertions(+) create mode 100644 audio/tangorpro/aidl_config/audio_platform_configuration_aidl.xml create mode 100644 audio/tangorpro/aidl_config/audio_policy_volumes.xml create mode 100644 audio/tangorpro/aidl_config/mixer_paths_aidl.xml diff --git a/audio/tangorpro/aidl_config/audio_platform_configuration_aidl.xml b/audio/tangorpro/aidl_config/audio_platform_configuration_aidl.xml new file mode 100644 index 0000000..912b4aa --- /dev/null +++ b/audio/tangorpro/aidl_config/audio_platform_configuration_aidl.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/tangorpro/aidl_config/audio_policy_volumes.xml b/audio/tangorpro/aidl_config/audio_policy_volumes.xml new file mode 100644 index 0000000..dfba47a --- /dev/null +++ b/audio/tangorpro/aidl_config/audio_policy_volumes.xml @@ -0,0 +1,227 @@ + + + + + + + 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,-4700 + 33,-3500 + 66,-2350 + 100,-1250 + + + + + + + 1,-3350 + 33,-2100 + 66,-1000 + 100,0 + + + + + + + + + + + + 0,-4800 + 33,-2050 + 66,-800 + 100,0 + + + + + + + 1,-3800 + 33,-2600 + 66,-1400 + 100,0 + + + + + + 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,-4700 + 33,-3500 + 66,-2350 + 100,-1250 + + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-5500 + 33,-3650 + 66,-2700 + 100,-1800 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml new file mode 100644 index 0000000..fa145a5 --- /dev/null +++ b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml @@ -0,0 +1,1077 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/tangorpro/audio-tables.mk b/audio/tangorpro/audio-tables.mk index 0debff0..3ea0940 100644 --- a/audio/tangorpro/audio-tables.mk +++ b/audio/tangorpro/audio-tables.mk @@ -16,6 +16,15 @@ AUDIO_TABLE_FOLDER := tangorpro +# Enable this to build AIDL +BUILD_AUDIO_AIDL_VERSION := false + +ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) +PRODUCT_COPY_FILES += \ + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml +else # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ @@ -34,6 +43,7 @@ PRODUCT_COPY_FILES += \ # Mixer Path Configuration for AudioHAL PRODUCT_COPY_FILES += \ device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml +endif # Speaker firmware files SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw