From 390f5dd1ef8ee31fab0508b570ec555ca731d75c Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Thu, 9 Feb 2023 10:49:40 +0800 Subject: [PATCH] audio: create aidl test config Bug: 206738075 Test: build pass Change-Id: I8438c0779f54c8333eaca03745180c6922380b8f Signed-off-by: Jasmine Cha --- audio/cheetah/aidl_config/audio_effects.xml | 68 ++ .../audio_platform_configuration.xml | 319 ++++++ .../audio_platform_configuration_aidl.xml | 189 ++++ .../audio_policy_configuration.xml | 168 +++ ...cy_configuration_a2dp_offload_disabled.xml | 239 +++++ ...icy_configuration_bluetooth_legacy_hal.xml | 235 +++++ ...licy_configuration_le_offload_disabled.xml | 260 +++++ .../aidl_config/audio_policy_volumes.xml | 227 ++++ ...with_le_audio_policy_configuration_7_0.xml | 71 ++ audio/cheetah/aidl_config/mixer_paths.xml | 889 ++++++++++++++++ .../cheetah/aidl_config/mixer_paths_aidl.xml | 978 ++++++++++++++++++ .../aidl_config/mixer_paths_factory.xml | 388 +++++++ .../sound_trigger_configuration.xml | 33 + audio/cheetah/audio-tables.mk | 32 +- audio/panther/aidl_config/audio_effects.xml | 68 ++ .../audio_platform_configuration.xml | 319 ++++++ .../audio_platform_configuration_aidl.xml | 189 ++++ .../audio_policy_configuration.xml | 168 +++ ...cy_configuration_a2dp_offload_disabled.xml | 239 +++++ ...icy_configuration_bluetooth_legacy_hal.xml | 235 +++++ ...licy_configuration_le_offload_disabled.xml | 260 +++++ .../aidl_config/audio_policy_volumes.xml | 227 ++++ ...with_le_audio_policy_configuration_7_0.xml | 71 ++ audio/panther/aidl_config/mixer_paths.xml | 889 ++++++++++++++++ .../panther/aidl_config/mixer_paths_aidl.xml | 978 ++++++++++++++++++ .../aidl_config/mixer_paths_factory.xml | 388 +++++++ .../sound_trigger_configuration.xml | 33 + audio/panther/audio-tables.mk | 32 +- 28 files changed, 8172 insertions(+), 20 deletions(-) create mode 100644 audio/cheetah/aidl_config/audio_effects.xml create mode 100644 audio/cheetah/aidl_config/audio_platform_configuration.xml create mode 100644 audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml create mode 100644 audio/cheetah/aidl_config/audio_policy_configuration.xml create mode 100644 audio/cheetah/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml create mode 100644 audio/cheetah/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml create mode 100644 audio/cheetah/aidl_config/audio_policy_configuration_le_offload_disabled.xml create mode 100644 audio/cheetah/aidl_config/audio_policy_volumes.xml create mode 100644 audio/cheetah/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml create mode 100644 audio/cheetah/aidl_config/mixer_paths.xml create mode 100644 audio/cheetah/aidl_config/mixer_paths_aidl.xml create mode 100644 audio/cheetah/aidl_config/mixer_paths_factory.xml create mode 100644 audio/cheetah/aidl_config/sound_trigger_configuration.xml create mode 100644 audio/panther/aidl_config/audio_effects.xml create mode 100644 audio/panther/aidl_config/audio_platform_configuration.xml create mode 100644 audio/panther/aidl_config/audio_platform_configuration_aidl.xml create mode 100644 audio/panther/aidl_config/audio_policy_configuration.xml create mode 100644 audio/panther/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml create mode 100644 audio/panther/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml create mode 100644 audio/panther/aidl_config/audio_policy_configuration_le_offload_disabled.xml create mode 100644 audio/panther/aidl_config/audio_policy_volumes.xml create mode 100644 audio/panther/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml create mode 100644 audio/panther/aidl_config/mixer_paths.xml create mode 100644 audio/panther/aidl_config/mixer_paths_aidl.xml create mode 100644 audio/panther/aidl_config/mixer_paths_factory.xml create mode 100644 audio/panther/aidl_config/sound_trigger_configuration.xml diff --git a/audio/cheetah/aidl_config/audio_effects.xml b/audio/cheetah/aidl_config/audio_effects.xml new file mode 100644 index 0000000..11e66e5 --- /dev/null +++ b/audio/cheetah/aidl_config/audio_effects.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/audio_platform_configuration.xml b/audio/cheetah/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..84ee3a5 --- /dev/null +++ b/audio/cheetah/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml new file mode 100644 index 0000000..eef3e87 --- /dev/null +++ b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/audio_policy_configuration.xml b/audio/cheetah/aidl_config/audio_policy_configuration.xml new file mode 100644 index 0000000..121c3fe --- /dev/null +++ b/audio/cheetah/aidl_config/audio_policy_configuration.xml @@ -0,0 +1,168 @@ + + + + + + + + + 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/cheetah/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/cheetah/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml new file mode 100644 index 0000000..f5c129f --- /dev/null +++ b/audio/cheetah/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -0,0 +1,239 @@ + + + + + + + + + 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/cheetah/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/cheetah/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml new file mode 100644 index 0000000..92d97af --- /dev/null +++ b/audio/cheetah/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -0,0 +1,235 @@ + + + + + + + + + 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/cheetah/aidl_config/audio_policy_configuration_le_offload_disabled.xml b/audio/cheetah/aidl_config/audio_policy_configuration_le_offload_disabled.xml new file mode 100644 index 0000000..7cf76e6 --- /dev/null +++ b/audio/cheetah/aidl_config/audio_policy_configuration_le_offload_disabled.xml @@ -0,0 +1,260 @@ + + + + + + + + + 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/cheetah/aidl_config/audio_policy_volumes.xml b/audio/cheetah/aidl_config/audio_policy_volumes.xml new file mode 100644 index 0000000..04e731d --- /dev/null +++ b/audio/cheetah/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/cheetah/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/cheetah/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml new file mode 100644 index 0000000..8b2af59 --- /dev/null +++ b/audio/cheetah/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/cheetah/aidl_config/mixer_paths.xml b/audio/cheetah/aidl_config/mixer_paths.xml new file mode 100644 index 0000000..153f117 --- /dev/null +++ b/audio/cheetah/aidl_config/mixer_paths.xml @@ -0,0 +1,889 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml new file mode 100644 index 0000000..502ca17 --- /dev/null +++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml @@ -0,0 +1,978 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/mixer_paths_factory.xml b/audio/cheetah/aidl_config/mixer_paths_factory.xml new file mode 100644 index 0000000..4dfc826 --- /dev/null +++ b/audio/cheetah/aidl_config/mixer_paths_factory.xml @@ -0,0 +1,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/sound_trigger_configuration.xml b/audio/cheetah/aidl_config/sound_trigger_configuration.xml new file mode 100644 index 0000000..dbee090 --- /dev/null +++ b/audio/cheetah/aidl_config/sound_trigger_configuration.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/audio-tables.mk b/audio/cheetah/audio-tables.mk index 3acd5ac..d3499bf 100644 --- a/audio/cheetah/audio-tables.mk +++ b/audio/cheetah/audio-tables.mk @@ -16,24 +16,36 @@ AUDIO_TABLE_FOLDER := cheetah +# 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/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml \ + device/google/pantah/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/pantah/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/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/pantah/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/pantah/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/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/pantah/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/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + device/google/pantah/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/pantah/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/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ + device/google/pantah/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/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml + device/google/pantah/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/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml + device/google/pantah/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/panther/aidl_config/audio_effects.xml b/audio/panther/aidl_config/audio_effects.xml new file mode 100644 index 0000000..11e66e5 --- /dev/null +++ b/audio/panther/aidl_config/audio_effects.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/audio_platform_configuration.xml b/audio/panther/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..84ee3a5 --- /dev/null +++ b/audio/panther/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml new file mode 100644 index 0000000..eef3e87 --- /dev/null +++ b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/audio_policy_configuration.xml b/audio/panther/aidl_config/audio_policy_configuration.xml new file mode 100644 index 0000000..121c3fe --- /dev/null +++ b/audio/panther/aidl_config/audio_policy_configuration.xml @@ -0,0 +1,168 @@ + + + + + + + + + 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/panther/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/panther/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml new file mode 100644 index 0000000..f5c129f --- /dev/null +++ b/audio/panther/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -0,0 +1,239 @@ + + + + + + + + + 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/panther/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/panther/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml new file mode 100644 index 0000000..92d97af --- /dev/null +++ b/audio/panther/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -0,0 +1,235 @@ + + + + + + + + + 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/panther/aidl_config/audio_policy_configuration_le_offload_disabled.xml b/audio/panther/aidl_config/audio_policy_configuration_le_offload_disabled.xml new file mode 100644 index 0000000..7cf76e6 --- /dev/null +++ b/audio/panther/aidl_config/audio_policy_configuration_le_offload_disabled.xml @@ -0,0 +1,260 @@ + + + + + + + + + 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/panther/aidl_config/audio_policy_volumes.xml b/audio/panther/aidl_config/audio_policy_volumes.xml new file mode 100644 index 0000000..04e731d --- /dev/null +++ b/audio/panther/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/panther/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/panther/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml new file mode 100644 index 0000000..8b2af59 --- /dev/null +++ b/audio/panther/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/panther/aidl_config/mixer_paths.xml b/audio/panther/aidl_config/mixer_paths.xml new file mode 100644 index 0000000..153f117 --- /dev/null +++ b/audio/panther/aidl_config/mixer_paths.xml @@ -0,0 +1,889 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml new file mode 100644 index 0000000..502ca17 --- /dev/null +++ b/audio/panther/aidl_config/mixer_paths_aidl.xml @@ -0,0 +1,978 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/mixer_paths_factory.xml b/audio/panther/aidl_config/mixer_paths_factory.xml new file mode 100644 index 0000000..4dfc826 --- /dev/null +++ b/audio/panther/aidl_config/mixer_paths_factory.xml @@ -0,0 +1,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/sound_trigger_configuration.xml b/audio/panther/aidl_config/sound_trigger_configuration.xml new file mode 100644 index 0000000..dbee090 --- /dev/null +++ b/audio/panther/aidl_config/sound_trigger_configuration.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/audio-tables.mk b/audio/panther/audio-tables.mk index e5e26fe..deee1cb 100644 --- a/audio/panther/audio-tables.mk +++ b/audio/panther/audio-tables.mk @@ -16,24 +16,36 @@ AUDIO_TABLE_FOLDER := panther +# 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/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml \ + device/google/pantah/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/pantah/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/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/pantah/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/pantah/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/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/pantah/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/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + device/google/pantah/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/pantah/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/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ + device/google/pantah/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/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml + device/google/pantah/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/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml + device/google/pantah/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