From 1a733133c5343cee3e9580070d340f4ed8a986cf Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Thu, 29 Jun 2023 14:40:24 +0800 Subject: [PATCH] audio: initialize aidl config Bug: 274373213 Test: manual test, boot to home Change-Id: Ia5d657f589aaae4bd63b5ba098241f1c120d9edf Signed-off-by: Jasmine Cha --- .../audio_platform_configuration_aidl.xml | 76 ++ .../aidl_config/audio_policy_volumes.xml | 243 +++++ audio/felix/aidl_config/mixer_paths_aidl.xml | 989 ++++++++++++++++++ audio/felix/audio-tables.mk | 12 + 4 files changed, 1320 insertions(+) create mode 100644 audio/felix/aidl_config/audio_platform_configuration_aidl.xml create mode 100644 audio/felix/aidl_config/audio_policy_volumes.xml create mode 100644 audio/felix/aidl_config/mixer_paths_aidl.xml diff --git a/audio/felix/aidl_config/audio_platform_configuration_aidl.xml b/audio/felix/aidl_config/audio_platform_configuration_aidl.xml new file mode 100644 index 0000000..37ed721 --- /dev/null +++ b/audio/felix/aidl_config/audio_platform_configuration_aidl.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/felix/aidl_config/audio_policy_volumes.xml b/audio/felix/aidl_config/audio_policy_volumes.xml new file mode 100644 index 0000000..7570dff --- /dev/null +++ b/audio/felix/aidl_config/audio_policy_volumes.xml @@ -0,0 +1,243 @@ + + + + + + + 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,-4960 + 33,-3650 + 66,-2650 + 100,-1250 + + + + + + + 1,-4735 + 14,-4170 + 28,-3600 + 71,-2030 + 100,-200 + + + + + + + 1,-6400 + 12,-5360 + 20,-4700 + 28,-4020 + 36,-3570 + 52,-2765 + 60,-2300 + 68,-1950 + 80,-1170 + 88,-750 + 92,-490 + 96,-210 + 100,0 + + + + + + + 0,-5900 + 17,-4650 + 34,-3210 + 83,-1430 + 100,-400 + + + + + + + 1,-4920 + 14,-4390 + 57,-2740 + 85,-1570 + 100,-300 + + + + + + 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,-4960 + 33,-3920 + 66,-2850 + 100,-1750 + + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-6460 + 33,-4490 + 66,-2460 + 100,-1280 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/felix/aidl_config/mixer_paths_aidl.xml b/audio/felix/aidl_config/mixer_paths_aidl.xml new file mode 100644 index 0000000..828cd8a --- /dev/null +++ b/audio/felix/aidl_config/mixer_paths_aidl.xml @@ -0,0 +1,989 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/felix/audio-tables.mk b/audio/felix/audio-tables.mk index 8fb6642..4e788d1 100644 --- a/audio/felix/audio-tables.mk +++ b/audio/felix/audio-tables.mk @@ -16,6 +16,17 @@ AUDIO_TABLE_FOLDER := felix +# Enable this to build AIDL +# BUILD_AUDIO_AIDL_VERSION := true + +ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) +# AIDL HAL configs are in the *config_aidl* folder +PRODUCT_COPY_FILES += \ + device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ + device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml +else +# HIDL HAL configs are in the *config* folder # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ device/google/felix/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 +45,7 @@ PRODUCT_COPY_FILES += \ # Mixer Path Configuration for AudioHAL PRODUCT_COPY_FILES += \ device/google/felix/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