From fc75f338a2cf303aaaffa3d6377b8df1ba23686f Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Fri, 3 Mar 2023 14:11:36 +0800 Subject: [PATCH] audio: create audio hal aidl config Bug: 206738075 Test: build pass Change-Id: Iaa571e7079782eaa0b07bf268f77d6f3e0884c62 Signed-off-by: Jasmine Cha --- audio/husky/aidl_config/audio_effects.xml | 65 ++ .../audio_platform_configuration.xml | 312 ++++++ .../audio_platform_configuration_aidl.xml | 189 ++++ .../audio_policy_configuration.xml | 282 +++++ ...cy_configuration_a2dp_offload_disabled.xml | 238 +++++ ...icy_configuration_bluetooth_legacy_hal.xml | 234 +++++ ...licy_configuration_le_offload_disabled.xml | 255 +++++ .../aidl_config/audio_policy_volumes.xml | 241 +++++ ...with_le_audio_policy_configuration_7_0.xml | 71 ++ audio/husky/aidl_config/mixer_paths.xml | 920 ++++++++++++++++ audio/husky/aidl_config/mixer_paths_aidl.xml | 981 ++++++++++++++++++ .../husky/aidl_config/mixer_paths_factory.xml | 413 ++++++++ .../sound_trigger_configuration.xml | 33 + audio/husky/audio-tables.mk | 33 +- audio/shiba/aidl_config/audio_effects.xml | 65 ++ .../audio_platform_configuration.xml | 312 ++++++ .../audio_platform_configuration_aidl.xml | 189 ++++ .../audio_policy_configuration.xml | 282 +++++ ...cy_configuration_a2dp_offload_disabled.xml | 238 +++++ ...icy_configuration_bluetooth_legacy_hal.xml | 234 +++++ ...licy_configuration_le_offload_disabled.xml | 255 +++++ .../aidl_config/audio_policy_volumes.xml | 241 +++++ ...with_le_audio_policy_configuration_7_0.xml | 71 ++ audio/shiba/aidl_config/mixer_paths.xml | 920 ++++++++++++++++ audio/shiba/aidl_config/mixer_paths_aidl.xml | 981 ++++++++++++++++++ .../shiba/aidl_config/mixer_paths_factory.xml | 413 ++++++++ .../sound_trigger_configuration.xml | 33 + audio/shiba/audio-tables.mk | 32 +- 28 files changed, 8513 insertions(+), 20 deletions(-) create mode 100644 audio/husky/aidl_config/audio_effects.xml create mode 100644 audio/husky/aidl_config/audio_platform_configuration.xml create mode 100644 audio/husky/aidl_config/audio_platform_configuration_aidl.xml create mode 100644 audio/husky/aidl_config/audio_policy_configuration.xml create mode 100644 audio/husky/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml create mode 100644 audio/husky/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml create mode 100644 audio/husky/aidl_config/audio_policy_configuration_le_offload_disabled.xml create mode 100644 audio/husky/aidl_config/audio_policy_volumes.xml create mode 100644 audio/husky/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml create mode 100644 audio/husky/aidl_config/mixer_paths.xml create mode 100644 audio/husky/aidl_config/mixer_paths_aidl.xml create mode 100644 audio/husky/aidl_config/mixer_paths_factory.xml create mode 100644 audio/husky/aidl_config/sound_trigger_configuration.xml create mode 100644 audio/shiba/aidl_config/audio_effects.xml create mode 100644 audio/shiba/aidl_config/audio_platform_configuration.xml create mode 100644 audio/shiba/aidl_config/audio_platform_configuration_aidl.xml create mode 100644 audio/shiba/aidl_config/audio_policy_configuration.xml create mode 100644 audio/shiba/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml create mode 100644 audio/shiba/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml create mode 100644 audio/shiba/aidl_config/audio_policy_configuration_le_offload_disabled.xml create mode 100644 audio/shiba/aidl_config/audio_policy_volumes.xml create mode 100644 audio/shiba/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml create mode 100644 audio/shiba/aidl_config/mixer_paths.xml create mode 100644 audio/shiba/aidl_config/mixer_paths_aidl.xml create mode 100644 audio/shiba/aidl_config/mixer_paths_factory.xml create mode 100644 audio/shiba/aidl_config/sound_trigger_configuration.xml diff --git a/audio/husky/aidl_config/audio_effects.xml b/audio/husky/aidl_config/audio_effects.xml new file mode 100644 index 0000000..e35bfbd --- /dev/null +++ b/audio/husky/aidl_config/audio_effects.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..4d5cf49 --- /dev/null +++ b/audio/husky/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/aidl_config/audio_platform_configuration_aidl.xml b/audio/husky/aidl_config/audio_platform_configuration_aidl.xml new file mode 100644 index 0000000..eef3e87 --- /dev/null +++ b/audio/husky/aidl_config/audio_platform_configuration_aidl.xml @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/aidl_config/audio_policy_configuration.xml b/audio/husky/aidl_config/audio_policy_configuration.xml new file mode 100644 index 0000000..7fb77a5 --- /dev/null +++ b/audio/husky/aidl_config/audio_policy_configuration.xml @@ -0,0 +1,282 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/husky/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml new file mode 100644 index 0000000..6352aac --- /dev/null +++ b/audio/husky/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -0,0 +1,238 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/husky/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml new file mode 100644 index 0000000..e80ded5 --- /dev/null +++ b/audio/husky/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -0,0 +1,234 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/aidl_config/audio_policy_configuration_le_offload_disabled.xml b/audio/husky/aidl_config/audio_policy_configuration_le_offload_disabled.xml new file mode 100644 index 0000000..da9db1a --- /dev/null +++ b/audio/husky/aidl_config/audio_policy_configuration_le_offload_disabled.xml @@ -0,0 +1,255 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/aidl_config/audio_policy_volumes.xml b/audio/husky/aidl_config/audio_policy_volumes.xml new file mode 100644 index 0000000..a18d26a --- /dev/null +++ b/audio/husky/aidl_config/audio_policy_volumes.xml @@ -0,0 +1,241 @@ + + + + + + + 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,-2970 + 33,-2010 + 66,-1020 + 100,0 + + + + + + + 1,-6253 + 4,-6253 + 8,-5936 + 12,-5567 + 16,-5255 + 20,-4916 + 24,-4577 + 28,-4227 + 32,-4017 + 36,-3800 + 40,-3580 + 44,-3364 + 48,-3100 + 52,-2871 + 56,-2639 + 60,-2405 + 64,-2167 + 68,-1941 + 72,-1707 + 76,-1438 + 80,-1235 + 84,-1075 + 88,-931 + 92,-741 + 96,-524 + 100,0 + + + + + + + 0,-2970 + 33,-2010 + 66,-1020 + 100,0 + + + + + + + 1,-2970 + 33,-2010 + 66,-1020 + 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,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/husky/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml new file mode 100644 index 0000000..8b2af59 --- /dev/null +++ b/audio/husky/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/audio/husky/aidl_config/mixer_paths.xml b/audio/husky/aidl_config/mixer_paths.xml new file mode 100644 index 0000000..8e3c6b0 --- /dev/null +++ b/audio/husky/aidl_config/mixer_paths.xml @@ -0,0 +1,920 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml new file mode 100644 index 0000000..260cda6 --- /dev/null +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -0,0 +1,981 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/aidl_config/mixer_paths_factory.xml b/audio/husky/aidl_config/mixer_paths_factory.xml new file mode 100644 index 0000000..16e0c3e --- /dev/null +++ b/audio/husky/aidl_config/mixer_paths_factory.xml @@ -0,0 +1,413 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/aidl_config/sound_trigger_configuration.xml b/audio/husky/aidl_config/sound_trigger_configuration.xml new file mode 100644 index 0000000..dbee090 --- /dev/null +++ b/audio/husky/aidl_config/sound_trigger_configuration.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index 9d7f27b..79f2eb3 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -16,24 +16,37 @@ AUDIO_TABLE_FOLDER := husky +# Enable this to build AIDL +# BUILD_AUDIO_AIDL_VERSION := true + +ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) +CONFIG_FOLDER := aidl_config +PRODUCT_COPY_FILES += \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml +else +CONFIG_FOLDER := config +endif + + # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_with_le_audio_policy_configuration_7_0.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_with_le_audio_policy_configuration_7_0.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml # Mixer Path Configuration for AudioHAL PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml # Speaker firmware files SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw diff --git a/audio/shiba/aidl_config/audio_effects.xml b/audio/shiba/aidl_config/audio_effects.xml new file mode 100644 index 0000000..e35bfbd --- /dev/null +++ b/audio/shiba/aidl_config/audio_effects.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..4d5cf49 --- /dev/null +++ b/audio/shiba/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml b/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml new file mode 100644 index 0000000..eef3e87 --- /dev/null +++ b/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/audio_policy_configuration.xml b/audio/shiba/aidl_config/audio_policy_configuration.xml new file mode 100644 index 0000000..7fb77a5 --- /dev/null +++ b/audio/shiba/aidl_config/audio_policy_configuration.xml @@ -0,0 +1,282 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/shiba/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml new file mode 100644 index 0000000..6352aac --- /dev/null +++ b/audio/shiba/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -0,0 +1,238 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/shiba/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml new file mode 100644 index 0000000..e80ded5 --- /dev/null +++ b/audio/shiba/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -0,0 +1,234 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/audio_policy_configuration_le_offload_disabled.xml b/audio/shiba/aidl_config/audio_policy_configuration_le_offload_disabled.xml new file mode 100644 index 0000000..da9db1a --- /dev/null +++ b/audio/shiba/aidl_config/audio_policy_configuration_le_offload_disabled.xml @@ -0,0 +1,255 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/audio_policy_volumes.xml b/audio/shiba/aidl_config/audio_policy_volumes.xml new file mode 100644 index 0000000..3fe738d --- /dev/null +++ b/audio/shiba/aidl_config/audio_policy_volumes.xml @@ -0,0 +1,241 @@ + + + + + + + 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,-2970 + 33,-2010 + 66,-1020 + 100,0 + + + + + + + 1,-6438 + 4,-6438 + 8,-5961 + 12,-5543 + 16,-5167 + 20,-4743 + 24,-4391 + 28,-4061 + 32,-3871 + 36,-3673 + 40,-3471 + 44,-3273 + 48,-3065 + 52,-2850 + 56,-2618 + 60,-2355 + 64,-2060 + 68,-1773 + 72,-1482 + 76,-1205 + 80,-989 + 84,-791 + 88,-578 + 92,-374 + 96,-137 + 100,0 + + + + + + + 0,-2970 + 33,-2010 + 66,-1020 + 100,0 + + + + + + + 1,-2970 + 33,-2010 + 66,-1020 + 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,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/shiba/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml new file mode 100644 index 0000000..8b2af59 --- /dev/null +++ b/audio/shiba/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/audio/shiba/aidl_config/mixer_paths.xml b/audio/shiba/aidl_config/mixer_paths.xml new file mode 100644 index 0000000..8e3c6b0 --- /dev/null +++ b/audio/shiba/aidl_config/mixer_paths.xml @@ -0,0 +1,920 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml new file mode 100644 index 0000000..260cda6 --- /dev/null +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -0,0 +1,981 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/mixer_paths_factory.xml b/audio/shiba/aidl_config/mixer_paths_factory.xml new file mode 100644 index 0000000..16e0c3e --- /dev/null +++ b/audio/shiba/aidl_config/mixer_paths_factory.xml @@ -0,0 +1,413 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/sound_trigger_configuration.xml b/audio/shiba/aidl_config/sound_trigger_configuration.xml new file mode 100644 index 0000000..dbee090 --- /dev/null +++ b/audio/shiba/aidl_config/sound_trigger_configuration.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index 7c54626..4a38243 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -16,24 +16,36 @@ AUDIO_TABLE_FOLDER := shiba +# Enable this to build AIDL +# BUILD_AUDIO_AIDL_VERSION := true + +ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) +CONFIG_FOLDER := aidl_config +PRODUCT_COPY_FILES += \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml +else +CONFIG_FOLDER := config +endif + # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_with_le_audio_policy_configuration_7_0.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_with_le_audio_policy_configuration_7_0.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml # Mixer Path Configuration for AudioHAL PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml # Speaker firmware files SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw