From 5b39e8475afc4ee90b54a4e46fdf3b4507633906 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Thu, 14 Jul 2022 15:56:22 +0800 Subject: [PATCH] audio: sync audio tables Test: manual test Signed-off-by: Jasmine Cha Change-Id: Ibc7c58bfd97d4170d00157883e0197204326a54a --- .../config/audio_platform_configuration.xml | 5 +-- .../config/audio_policy_configuration.xml | 23 ++++++++---- ...cy_configuration_a2dp_offload_disabled.xml | 23 ++++++++---- ...icy_configuration_bluetooth_legacy_hal.xml | 19 ++++++---- audio/tangorpro/config/mixer_paths.xml | 34 ++++++++++++++++++ audio/tangorpro/tuning/waves/waves_preset.mps | Bin 48731 -> 42569 bytes 6 files changed, 81 insertions(+), 23 deletions(-) diff --git a/audio/tangorpro/config/audio_platform_configuration.xml b/audio/tangorpro/config/audio_platform_configuration.xml index c15d6d8..d6df79a 100644 --- a/audio/tangorpro/config/audio_platform_configuration.xml +++ b/audio/tangorpro/config/audio_platform_configuration.xml @@ -35,7 +35,7 @@ - + @@ -205,6 +205,7 @@ + @@ -289,7 +290,7 @@ - + diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml index 3418fc2..a8f55b8 100644 --- a/audio/tangorpro/config/audio_policy_configuration.xml +++ b/audio/tangorpro/config/audio_policy_configuration.xml @@ -18,7 +18,6 @@ Speaker Speaker Safe - Earpiece Built-In Mic Built-In Back Mic Telephony Tx @@ -79,6 +78,10 @@ + + + + + + - - @@ -144,6 +150,8 @@ + + @@ -185,11 +193,9 @@ + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/> - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/> + + diff --git a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml index 619e544..1fcb527 100644 --- a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -18,7 +18,6 @@ Speaker Speaker Safe - Earpiece Built-In Mic Built-In Back Mic Telephony Tx @@ -79,6 +78,10 @@ + + + + + + - - @@ -144,6 +150,8 @@ + + @@ -170,15 +178,15 @@ + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/> - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/> + + diff --git a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 80fce29..448b30e 100644 --- a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -18,7 +18,6 @@ Speaker Speaker Safe - Earpiece Built-In Mic Built-In Back Mic Telephony Tx @@ -79,6 +78,10 @@ + + + + + + - - @@ -170,11 +176,9 @@ + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/> - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/> + diff --git a/audio/tangorpro/config/mixer_paths.xml b/audio/tangorpro/config/mixer_paths.xml index 11fbae9..88fee50 100644 --- a/audio/tangorpro/config/mixer_paths.xml +++ b/audio/tangorpro/config/mixer_paths.xml @@ -151,6 +151,7 @@ + @@ -248,6 +249,7 @@ + @@ -281,6 +283,12 @@ + + + + + + @@ -414,6 +422,10 @@ + + + + @@ -566,6 +578,10 @@ + + + + @@ -871,6 +887,16 @@ + + + + + + + + + + @@ -918,4 +944,12 @@ + + + + + + + + diff --git a/audio/tangorpro/tuning/waves/waves_preset.mps b/audio/tangorpro/tuning/waves/waves_preset.mps index bf4aa60437b991783a9d61f61ec55aef02a1e9ea..08e32271ceb24511fa7e37e936d586512699bf10 100644 GIT binary patch literal 42569 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