audio: add mixer paths for call screen mode

Bug: 140384450
Test: build pass, call screen mode functions
Change-Id: Iec1740df2a9b507dc31839a45410cd5e34a2838a
Signed-off-by: JJ Lee <leejj@google.com>
This commit is contained in:
JJ Lee
2020-03-24 20:16:23 +08:00
committed by Cyan_Hsieh
parent 0ec997dc79
commit 1ab04aed6c
3 changed files with 47 additions and 6 deletions

View File

@@ -154,6 +154,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"/>

View File

@@ -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">

View File

@@ -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 -->
@@ -251,10 +257,10 @@
<!-- RT Proxy Cal end -->
<!-- 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 -->
@@ -1252,7 +1258,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">
@@ -1323,8 +1329,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">
@@ -1395,6 +1405,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" />
@@ -1469,6 +1483,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>
@@ -1620,6 +1638,11 @@
<ctl name="VoiceMMode1_Tx Mixer PRI_TDM_TX_0_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" />
@@ -1705,6 +1728,11 @@
<ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_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" />
@@ -2910,12 +2938,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" />