diff options
| author | HW Lee <hwlee@google.com> | 2018-09-20 15:37:57 +0800 |
|---|---|---|
| committer | HW Lee <hwlee@google.com> | 2018-09-25 02:31:24 +0000 |
| commit | b04e665e54ad970ae301a8a939130d4074689d98 (patch) | |
| tree | 6e7ceb2ac381a00fd3ec789abb5e04c1a5468048 /mixer_paths_intcodec_s4.xml | |
| parent | af2d0ce398a75587cf365808724759ed86e66c83 (diff) | |
audio: b4s4: mixer and platform info table update
[mixer_paths]
1. modified "handset-mic"
2. modified "camcorder-mic"
3. modified "headphones"
4. add "Voice Sidetone Enable", "sidetone-headphones"
5. add "voice-headphones-tmus", "voice-headphones-att"
6. Add backend path supported on mix table for all related record path to prevent path no found
[audio_platform_info]
1. add acdb_id/backend to make voice recording and camcorder use the correct path.
2. add acdb_id/backend to make voice call scenario use the correct path.
3. add operator_info/operator_specific for tmus/att.
4. modify DMIC_AEC_NS for choosing the correct acdb_id/backend.
Bug: 116176025
Test: camcoder/voip(skype, hangouts)/record/playback
Change-Id: Iddc6d7beabde34d320ba065b27c189c744421cea
Signed-off-by: HW Lee <hwlee@google.com>
Diffstat (limited to 'mixer_paths_intcodec_s4.xml')
| -rw-r--r-- | mixer_paths_intcodec_s4.xml | 123 |
1 files changed, 119 insertions, 4 deletions
diff --git a/mixer_paths_intcodec_s4.xml b/mixer_paths_intcodec_s4.xml index ae59ec36..2e754eea 100644 --- a/mixer_paths_intcodec_s4.xml +++ b/mixer_paths_intcodec_s4.xml @@ -169,6 +169,7 @@ <ctl name="PRI TDM TX Channel Offset" id="0" value="0" /> <ctl name="PRI TDM TX Channel Offset" id="1" value="8" /> <ctl name="PRI TDM TX Channel Offset" id="2" value="12" /> + <ctl name="Voice Sidetone Enable" value="0" /> <!-- ALC5513 config end--> <!-- 24-bit ASM config --> @@ -242,6 +243,8 @@ <ctl name="INT4_MI2S_RX_Voice Mixer VoiceMMode1" value="0" /> <ctl name="INT0_MI2S_RX_Voice Mixer VoiceMMode1" value="0" /> <ctl name="VoiceMMode1_Tx Mixer INT3_MI2S_TX_MMode1" value="0" /> + <ctl name="SEC_TDM_RX_0_Voice Mixer VoiceMMode1" value="0" /> + <ctl name="VoiceMMode1_Tx Mixer PRI_TDM_TX_0_MMode1" value="0" /> <!-- Multimode Voice1 BTSCO --> <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode1" value="0" /> <ctl name="VoiceMMode1_Tx Mixer SLIM_7_TX_MMode1" value="0" /> @@ -256,6 +259,8 @@ <ctl name="INT4_MI2S_RX_Voice Mixer VoiceMMode2" value="0" /> <ctl name="INT0_MI2S_RX_Voice Mixer VoiceMMode2" value="0" /> <ctl name="VoiceMMode2_Tx Mixer INT3_MI2S_TX_MMode2" value="0" /> + <ctl name="SEC_TDM_RX_0_Voice Mixer VoiceMMode2" value="0" /> + <ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode1" value="0" /> <!-- Multimode Voice2 BTSCO --> <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode2" value="0" /> <ctl name="VoiceMMode2_Tx Mixer SLIM_7_TX_MMode2" value="0" /> @@ -297,6 +302,8 @@ <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="0" /> <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="0" /> <ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="0" /> + <ctl name="SEC_TDM_RX_0_Voice Mixer Voip" value="0"/> + <ctl name="Voip_Tx Mixer PRI_TDM_0_TX_Voip" value="0"/> <!-- compress-voip-call end--> <!-- Audio BTSCO --> @@ -856,6 +863,15 @@ <path name="audio-record headset-mic"> <ctl name="MultiMedia1 Mixer INT3_MI2S_TX" value="1" /> </path> + + <path name="audio-record handset-mic"> + <ctl name="MultiMedia1 Mixer PRI_TDM_TX_0" value="1" /> + </path> + + <path name="audio-record speaker-mic"> + <ctl name="MultiMedia1 Mixer PRI_TDM_TX_0" value="1" /> + </path> + <path name="audio-record usb-headset-mic"> <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="1" /> </path> @@ -910,6 +926,14 @@ <ctl name="MultiMedia8 Mixer INT3_MI2S_TX" value="1" /> </path> + <path name="audio-record-compress handset-mic"> + <ctl name="MultiMedia8 Mixer PRI_TDM_TX_0" value="1" /> + </path> + + <path name="audio-record-compress speaker-mic"> + <ctl name="MultiMedia8 Mixer PRI_TDM_TX_0" value="1" /> + </path> + <path name="audio-record-compress usb-headset-mic"> <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="1" /> </path> @@ -931,6 +955,14 @@ <ctl name="MultiMedia8 Mixer INT3_MI2S_TX" value="1" /> </path> + <path name="low-latency-record handset-mic"> + <ctl name="MultiMedia8 Mixer PRI_TDM_TX_0" value="1" /> + </path> + + <path name="low-latency-record speaker-mic"> + <ctl name="MultiMedia8 Mixer PRI_TDM_TX_0" value="1" /> + </path> + <path name="low-latency-record usb-headset-mic"> <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="1" /> </path> @@ -971,6 +1003,14 @@ <path name="incall-rec-uplink" /> </path> + <path name="incall-rec-uplink handset-mic"> + <path name="incall-rec-uplink" /> + </path> + + <path name="incall-rec-uplink speaker-mic"> + <path name="incall-rec-uplink" /> + </path> + <path name="incall-rec-uplink usb-headset-mic"> <path name="incall-rec-uplink" /> </path> @@ -995,6 +1035,14 @@ <path name="incall-rec-uplink-compress" /> </path> + <path name="incall-rec-uplink-compress handset-mic"> + <path name="incall-rec-uplink-compress" /> + </path> + + <path name="incall-rec-uplink-compress speaker-mic"> + <path name="incall-rec-uplink-compress" /> + </path> + <path name="incall-rec-uplink-compress usb-headset-mic"> <path name="incall-rec-uplink-compress" /> </path> @@ -1019,6 +1067,14 @@ <path name="incall-rec-downlink" /> </path> + <path name="incall-rec-downlink handset-mic"> + <path name="incall-rec-downlink" /> + </path> + + <path name="incall-rec-downlink speaker-mic"> + <path name="incall-rec-downlink" /> + </path> + <path name="incall-rec-downlink usb-headset-mic"> <path name="incall-rec-downlink" /> </path> @@ -1043,6 +1099,14 @@ <path name="incall-rec-downlink-compress" /> </path> + <path name="incall-rec-downlink-compress handset-mic"> + <path name="incall-rec-downlink-compress" /> + </path> + + <path name="incall-rec-downlink-compress speaker-mic"> + <path name="incall-rec-downlink-compress" /> + </path> + <path name="incall-rec-downlink-compress usb-headset-mic"> <path name="incall-rec-downlink-compress" /> </path> @@ -1068,6 +1132,14 @@ <path name="incall-rec-uplink-and-downlink" /> </path> + <path name="incall-rec-uplink-and-downlink handset-mic"> + <path name="incall-rec-uplink-and-downlink" /> + </path> + + <path name="incall-rec-uplink-and-downlink speaker-mic"> + <path name="incall-rec-uplink-and-downlink" /> + </path> + <path name="incall-rec-uplink-and-downlink usb-headset-mic"> <path name="incall-rec-uplink-and-downlink" /> </path> @@ -1093,6 +1165,14 @@ <path name="incall-rec-uplink-and-downlink-compress" /> </path> + <path name="incall-rec-uplink-and-downlink-compress handset-mic"> + <path name="incall-rec-uplink-and-downlink-compress" /> + </path> + + <path name="incall-rec-uplink-and-downlink-compress speaker-mic"> + <path name="incall-rec-uplink-and-downlink-compress" /> + </path> + <path name="incall-rec-uplink-and-downlink-compress usb-headset-mic"> <path name="incall-rec-uplink-and-downlink-compress" /> </path> @@ -1340,6 +1420,14 @@ <ctl name="MultiMedia10 Mixer INT3_MI2S_TX" value="1" /> </path> + <path name="audio-record-voip handset-mic"> + <ctl name="MultiMedia10 Mixer PRI_TDM_TX_0" value="1" /> + </path> + + <path name="audio-record-voip speaker-mic"> + <ctl name="MultiMedia10 Mixer PRI_TDM_TX_0" value="1" /> + </path> + <path name="audio-record-voip usb-headset-mic"> <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="1" /> </path> @@ -1473,6 +1561,7 @@ <ctl name="RX1 MIX2 INP1" value="IIR1" /> <ctl name="RX2 MIX2 INP1" value="IIR1" /> <ctl name="IIR1 INP1 Volume" value="53" /> + <ctl name="Voice Sidetone Enable" value="1" /> </path> <path name="sidetone-handset"> @@ -1546,7 +1635,7 @@ </path> <path name="handset-mic"> - <ctl name="ADC1 Capture Volume" value="45"/> + <ctl name="ADC1 Capture Volume" value="43"/> <ctl name="PRI_TDM_TX_0 Channels" value="One"/> <ctl name="Sto1 ADC MIXL DMIC Switch" value="1" /> <ctl name="Stereo1 DMIC Mux" value="DMIC1" /> @@ -1577,13 +1666,13 @@ </path> <path name="headphones"> + <ctl name="COMP0 RX1" value="1" /> + <ctl name="COMP0 RX2" value="1" /> <ctl name="INT0_MI2S_RX Channels" value="Two" /> <ctl name="RX1 MIX1 INP1" value="RX1" /> <ctl name="RX2 MIX1 INP1" value="RX2" /> <ctl name="RDAC2 MUX" value="RX2" /> <ctl name="RX HPH Mode" value="HD2" /> - <ctl name="COMP0 RX1" value="1" /> - <ctl name="COMP0 RX2" value="1" /> <ctl name="HPHL" value="Switch" /> <ctl name="HPHR" value="Switch" /> <ctl name="RX1 Digital Volume" value="74" /> @@ -1651,10 +1740,14 @@ <path name="voice-headphones-tmus"> <path name="headphones" /> + <ctl name="RX1 Digital Volume" value="80" /> + <ctl name="RX2 Digital Volume" value="80" /> </path> <path name="voice-headphones-att"> <path name="headphones" /> + <ctl name="RX1 Digital Volume" value="80" /> + <ctl name="RX2 Digital Volume" value="80" /> </path> <path name="voice-line"> @@ -1756,7 +1849,13 @@ </path> <path name="camcorder-mic"> - <path name="three-mic" /> + <ctl name="ADC1 Capture Volume" value="40"/> + <ctl name="ADC2 Capture Volume" value="40"/> + <ctl name="PRI_TDM_TX_0 Channels" value="Two"/> + <ctl name="Sto1 ADC MIXL DMIC Switch" value="1" /> + <ctl name="Sto2 ADC MIXL DMIC Switch" value="1" /> + <ctl name="Stereo1 DMIC Mux" value="DMIC1" /> + <ctl name="Stereo2 DMIC Mux" value="DMIC2" /> </path> <path name="hdmi-tx"> @@ -2127,6 +2226,14 @@ <ctl name="MultiMedia16 Mixer INT3_MI2S_TX" value="1" /> </path> + <path name="mmap-record handset-mic"> + <ctl name="MultiMedia16 Mixer PRI_TDM_TX_0" value="1" /> + </path> + + <path name="mmap-record speaker-mic"> + <ctl name="MultiMedia16 Mixer PRI_TDM_TX_0" value="1" /> + </path> + <path name="mmap-record usb-headset-mic"> <ctl name="MultiMedia16 Mixer USB_AUDIO_TX" value="1" /> </path> @@ -2223,6 +2330,14 @@ <ctl name="MultiMedia2 Mixer INT3_MI2S_TX" value="1" /> </path> + <path name="hifi-record handset-mic"> + <ctl name="MultiMedia2 Mixer PRI_TDM_TX_0" value="1" /> + </path> + + <path name="hifi-record speaker-mic"> + <ctl name="MultiMedia2 Mixer PRI_TDM_TX_0" value="1" /> + </path> + <path name="hifi-record usb-headset-mic"> <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" /> </path> |
