diff options
author | JJ Lee <leejj@google.com> | 2020-05-28 10:30:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-28 10:30:32 +0000 |
commit | e59238cdc25a0deb776e30e2c41908ef7b139934 (patch) | |
tree | f9aafb9cfa3338a34e609b60fcdde0cda59114e8 | |
parent | 90b507023705f8a4c07b0e4f88c734b7b87ede4a (diff) | |
parent | ff1ee810b9d601bf0447ee3b238a3f18fb4b309d (diff) | |
download | bramble-e59238cdc25a0deb776e30e2c41908ef7b139934.tar.gz |
audio: add mixer paths for call screen mode am: ff1ee810b9
Change-Id: I28267366e383a88ce78548114616e877d6e3545f
-rw-r--r-- | audio/audio_platform_info_bolero_snd.xml | 3 | ||||
-rw-r--r-- | audio/audio_policy_configuration.xml | 2 | ||||
-rw-r--r-- | audio/mixer_paths_bolero_snd.xml | 48 |
3 files changed, 47 insertions, 6 deletions
diff --git a/audio/audio_platform_info_bolero_snd.xml b/audio/audio_platform_info_bolero_snd.xml index c76f107..f079222 100644 --- a/audio/audio_platform_info_bolero_snd.xml +++ b/audio/audio_platform_info_bolero_snd.xml @@ -153,6 +153,9 @@ <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="35" /> <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" /> <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="23"/> + <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="23" /> + <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="23" /> + <usecase name="USECASE_INCALL_REC_UPLINK_AND_DOWNLINK" type="in" id="23"/> </pcm_ids> <config_params> <param key="spkr_1_tz_name" value="wsatz.13"/> diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index e87a66d..0c0b87d 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -15,7 +15,7 @@ --> <audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude"> - <globalConfiguration speaker_drc_enabled="true"/> + <globalConfiguration speaker_drc_enabled="true" call_screen_mode_supported="true"/> <modules> <module name="primary" halVersion="2.0"> diff --git a/audio/mixer_paths_bolero_snd.xml b/audio/mixer_paths_bolero_snd.xml index a8c4eed..265bc3d 100644 --- a/audio/mixer_paths_bolero_snd.xml +++ b/audio/mixer_paths_bolero_snd.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. --> +<!-- Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. --> <!-- --> <!-- Redistribution and use in source and binary forms, with or without --> <!-- modification, are permitted provided that the following conditions are --> @@ -221,6 +221,9 @@ <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="0" /> <!-- Multimode Voice1 Display-Port --> <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="0" /> + <!-- Multimode Voice1 proxy-Port --> + <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="0" /> + <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="0" /> <!-- Miltimode Voice1 end--> <!-- Multimode Voice2 --> @@ -239,6 +242,9 @@ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="0" /> <!-- Multimode Voice2 Display-Port --> <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="0" /> + <!-- Multimode Voice2 proxy-Port --> + <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="0" /> + <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="0" /> <!-- Multimode Voice2 end--> <!-- Voice external ec. reference --> @@ -253,8 +259,8 @@ <!-- Incall Recording --> <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="0" /> <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="0" /> - <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="0" /> - <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="0" /> + <ctl name="MultiMedia9 Mixer VOC_REC_UL" value="0" /> + <ctl name="MultiMedia9 Mixer VOC_REC_DL" value="0" /> <!-- Incall Recording End --> <!-- Incall Music --> @@ -1282,7 +1288,7 @@ </path> <path name="incall-rec-uplink"> - <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" /> + <ctl name="MultiMedia9 Mixer VOC_REC_UL" value="1" /> </path> <path name="incall-rec-uplink headset-mic"> @@ -1353,8 +1359,12 @@ <path name="incall-rec-uplink-compress" /> </path> + <path name="incall-rec-uplink call-proxy-in"> + <path name="incall-rec-uplink" /> + </path> + <path name="incall-rec-downlink"> - <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="1" /> + <ctl name="MultiMedia9 Mixer VOC_REC_DL" value="1" /> </path> <path name="incall-rec-downlink usb-headset-mic"> @@ -1425,6 +1435,10 @@ <path name="incall-rec-downlink-compress" /> </path> + <path name="incall-rec-downlink call-proxy-in"> + <path name="incall-rec-downlink" /> + </path> + <path name="incall-rec-uplink-and-downlink"> <path name="incall-rec-uplink" /> <path name="incall-rec-downlink" /> @@ -1499,6 +1513,10 @@ <path name="incall-rec-uplink-and-downlink-compress" /> </path> + <path name="incall-rec-uplink-and-downlink call-proxy-in"> + <path name="incall-rec-uplink-and-downlink" /> + </path> + <path name="hfp-sco"> </path> @@ -1656,6 +1674,11 @@ <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" /> </path> + <path name="voicemmode1-call call-proxy"> + <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="1" /> + <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="1" /> + </path> + <path name="voicemmode2-call"> <ctl name="QUIN_TDM_RX_0_Voice Mixer VoiceMMode2" value="1" /> <ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode2" value="1" /> @@ -1746,6 +1769,11 @@ <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" /> </path> + <path name="voicemmode2-call call-proxy"> + <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="1" /> + <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="1" /> + </path> + <!-- VoIP Rx settings --> <path name="audio-playback-voip"> <ctl name="QUIN_TDM_RX_0 Audio Mixer MultiMedia10" value="1" /> @@ -2971,12 +2999,22 @@ <path name="incall_music_uplink2" /> </path> + <path name="incall_music_uplink call-proxy"> + <path name="incall_music_uplink" /> + </path> + <path name="voice-rx"> </path> <path name="voice-tx"> </path> + <path name="call-proxy"> + </path> + + <path name="call-proxy-in"> + </path> + <!-- cs35l41 specific path to load firmware in cs35l41-playback.c --> <path name="cs35l41-load-protection-firmware-start"> <ctl name="DSP Booted" value="0" /> |