From ca641b8d7aa58fe4fa2f89726a95ece8f647a416 Mon Sep 17 00:00:00 2001 From: "Wan, Xinxin" Date: Tue, 25 Feb 2025 03:10:31 +0000 Subject: [PATCH] Fix to improve Android alarm context switch latency Allocate different pcm devices for each context used in Android. Test-done: - Play different context simulatenously and no audio loss seen Tracked-On: OAM-129522 Signed-off-by: Wan, Xinxin --- ..._policy_configuration_attached_devices.xml | 37 +++++--- .../audio_policy_configuration_devices.xml | 89 ++++++++++++++----- .../audio_policy_configuration_mixports.xml | 43 +++++++++ .../audio_policy_configuration_routes.xml | 30 ++++--- .../policy/car_audio_configuration.xml | 78 +++++++++++++--- 5 files changed, 224 insertions(+), 53 deletions(-) diff --git a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_attached_devices.xml b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_attached_devices.xml index 976c3a900..420771fdd 100644 --- a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_attached_devices.xml +++ b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_attached_devices.xml @@ -17,23 +17,36 @@ bus0_media_CARD_0_DEV_1 - bus1_navigation_CARD_0_DEV_1 - bus2_voice_command_CARD_0_DEV_1 - bus3_call_ring_CARD_0_DEV_1 - bus4_call_CARD_0_DEV_1 - bus5_alarm_CARD_0_DEV_1 + bus1_navigation_CARD_0_DEV_5 + bus2_voice_command_CARD_0_DEV_5 + bus3_call_ring_CARD_0_DEV_6 + bus4_call_CARD_0_DEV_6 + bus5_alarm_CARD_0_DEV_7 bus6_notification_CARD_0_DEV_1 - bus7_system_sound_CARD_0_DEV_1 + bus7_system_sound_CARD_0_DEV_7 - Built-In Mic - Built-In Back Mic + bottom + + back Echo-Reference Mic - i_bus1_CARD_0_DEV_1 + + i_bus1_CARD_0_DEV_5 bus100_CARD_0_DEV_2 - bus101_CARD_0_DEV_3 - + + bus101_CARD_0_DEV_8 + i_bus100_CARD_0_DEV_2 - + + + bus200_CARD_0_DEV_3 + + i_bus200_CARD_0_DEV_3 + + + bus300_CARD_0_DEV_4 + + i_bus300_CARD_0_DEV_4 + diff --git a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_devices.xml b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_devices.xml index 978cb2d10..fee5e9823 100644 --- a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_devices.xml +++ b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_devices.xml @@ -25,8 +25,8 @@ defaultValueMB="0" stepValueMB="100"/> - + @@ -35,8 +35,8 @@ defaultValueMB="0" stepValueMB="100"/> - + @@ -45,8 +45,8 @@ defaultValueMB="0" stepValueMB="100"/> - + @@ -55,8 +55,8 @@ defaultValueMB="0" stepValueMB="100"/> - + @@ -65,8 +65,8 @@ defaultValueMB="0" stepValueMB="100"/> - + @@ -85,8 +85,8 @@ defaultValueMB="0" stepValueMB="100"/> - + @@ -96,14 +96,14 @@ - + - + @@ -114,8 +114,8 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK"/> - + @@ -137,8 +137,8 @@ defaultValueMB="0" stepValueMB="100"/> - + @@ -159,4 +159,53 @@ defaultValueMB="0" stepValueMB="100"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_mixports.xml b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_mixports.xml index 2a2abb870..fc80998b5 100644 --- a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_mixports.xml +++ b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_mixports.xml @@ -63,6 +63,21 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_routes.xml b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_routes.xml index 1804cd49b..887b82e4a 100644 --- a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_routes.xml +++ b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_routes.xml @@ -17,23 +17,33 @@ - - + - - - + + + - - - + + + + - + + + + + + + + + + diff --git a/groups/audio/audio_base_aaos/default/policy/car_audio_configuration.xml b/groups/audio/audio_base_aaos/default/policy/car_audio_configuration.xml index 7a7479327..2a82a9aa7 100644 --- a/groups/audio/audio_base_aaos/default/policy/car_audio_configuration.xml +++ b/groups/audio/audio_base_aaos/default/policy/car_audio_configuration.xml @@ -37,24 +37,26 @@ - + - + - - - + + + + + - + - + @@ -65,9 +67,9 @@ - - + + + @@ -95,7 +97,7 @@ - + @@ -117,6 +119,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +