dereference
/
android_hardware_qcom_audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: Add new device for voice headset 

3-pole headphones not working for voice
usecase due to different backend added
for headset.

add new device for headset to differentiate
from headphones and update mixer path
accordingly.

Change-Id: Ieb12d33707deaaf735dbe57a571567e5e3edc812
This commit is contained in:
Samyak Jain 2019-05-02 17:26:18 +05:30 committed by Gerrit - the friendly Code Review server
parent 99c1fc0d8b
commit c96d28ea85
2 changed files with 96 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/msmnile/audio_platform_info.xml
View File

@ -138,6 +138,7 @@
<device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_FB_HEADSET" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
<device name="SND_DEVICE_OUT_VOICE_HEADSET" backend="headset" interface="SLIMBUS_6_RX"/>
<device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="SLIMBUS_6_RX"/>
<device name="SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET" backend="headphones" interface="SLIMBUS_6_RX"/>
<device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="SLIMBUS_6_RX"/>

96
configs/msmnile/mixer_paths_tavil.xml
View File

@ -567,6 +567,10 @@
<ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
</path>
<path name="echo-reference headset">
<path name="echo-reference headphones" />
</path>
<path name="echo-reference display-port">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT" />
</path>
@ -582,6 +586,10 @@
<ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_6_RX" />
</path>
<path name="echo-reference-voip headset">
<path name="echo-reference-voip headphones" />
</path>
<path name="echo-reference-voip display-port">
<ctl name="AUDIO_REF_EC_UL10 MUX" value="DISPLAY_PORT" />
</path>
@ -633,6 +641,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="1" />
</path>
<path name="deep-buffer-playback headset">
<path name="deep-buffer-playback headphones" />
</path>
<path name="deep-buffer-playback speaker-and-headphones">
<path name="deep-buffer-playback headphones" />
<path name="deep-buffer-playback" />
@ -695,6 +707,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="1" />
</path>
<path name="low-latency-playback headset">
<path name="low-latency-playback headphones" />
</path>
<path name="low-latency-playback speaker-and-headphones">
<path name="low-latency-playback headphones" />
<path name="low-latency-playback" />
@ -726,6 +742,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia8" value="1" />
</path>
<path name="audio-ull-playback headset">
<path name="audio-ull-playback headphones" />
</path>
<path name="audio-ull-playback speaker-and-headphones">
<path name="audio-ull-playback" />
<path name="audio-ull-playback headphones" />
@ -830,6 +850,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="1" />
</path>
<path name="compress-offload-playback headset">
<path name="compress-offload-playback headphones" />
</path>
<path name="compress-offload-playback headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" />
</path>
@ -896,6 +920,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="1" />
</path>
<path name="compress-offload-playback2 headset">
<path name="compress-offload-playback2 headphones" />
</path>
<path name="compress-offload-playback2 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="1" />
</path>
@ -962,6 +990,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="compress-offload-playback3 headset">
<path name="compress-offload-playback3 headphones" />
</path>
<path name="compress-offload-playback3 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="1" />
</path>
@ -1029,6 +1061,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="1" />
</path>
<path name="compress-offload-playback4 headset">
<path name="compress-offload-playback4 headphones" />
</path>
<path name="compress-offload-playback4 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="1" />
</path>
@ -1095,6 +1131,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="1" />
</path>
<path name="compress-offload-playback5 headset">
<path name="compress-offload-playback5 headphones" />
</path>
<path name="compress-offload-playback5 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="1" />
</path>
@ -1161,6 +1201,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="1" />
</path>
<path name="compress-offload-playback6 headset">
<path name="compress-offload-playback6 headphones" />
</path>
<path name="compress-offload-playback6 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="1" />
</path>
@ -1227,6 +1271,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="1" />
</path>
<path name="compress-offload-playback7 headset">
<path name="compress-offload-playback7 headphones" />
</path>
<path name="compress-offload-playback7 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="1" />
</path>
@ -1293,6 +1341,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="1" />
</path>
<path name="compress-offload-playback8 headset">
<path name="compress-offload-playback8 headphones" />
</path>
<path name="compress-offload-playback8 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="1" />
</path>
@ -1359,6 +1411,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
</path>
<path name="compress-offload-playback9 headset">
<path name="compress-offload-playback9 headphones" />
</path>
<path name="compress-offload-playback9 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="1" />
</path>
@ -1490,6 +1546,10 @@
<ctl name="SLIMBUS6_DL_HL Switch" value="1" />
</path>
<path name="play-fm headset">
<path name="play-fm headphones" />
</path>
<path name="incall-rec-uplink">
<ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />
</path>
@ -1642,6 +1702,10 @@
<path name="hfp-sco headphones">
</path>
<path name="hfp-sco headset">
<path name="hfp-sco headphones" />
</path>
<path name="hfp-sco-wb">
<path name="hfp-sco" />
</path>
@ -1650,6 +1714,10 @@
<path name="hfp-sco headphones" />
</path>
<path name="hfp-sco-wb headset">
<path name="hfp-sco headphones" />
</path>
<path name="compress-voip-call">
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
@ -1662,9 +1730,13 @@
<path name="compress-voip-call headphones">
<ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer SLIM_1_TX_Voip" value="1" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
</path>
<path name="compress-voip-call headset">
<ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer SLIM_1_TX_Voip" value="1" />
</path>
<path name="compress-voip-call bt-sco">
<ctl name="SLIM_7_RX_Voice Mixer Voip" value="1" />
@ -1697,6 +1769,11 @@
</path>
<path name="voicemmode1-call headphones">
<ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
</path>
<path name="voicemmode1-call headset">
<ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_1_TX_MMode1" value="1" />
</path>
@ -1742,6 +1819,11 @@
</path>
<path name="voicemmode2-call headphones">
<ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
</path>
<path name="voicemmode2-call headset">
<ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_1_TX_MMode2" value="1" />
</path>
@ -1790,6 +1872,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="audio-playback-voip headset">
<path name="audio-playback-voip headphones" />
</path>
<path name="audio-playback-voip bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
</path>
@ -2294,6 +2380,10 @@
<path name="headphones" />
</path>
<path name="voice-headset">
<path name="headphones" />
</path>
<path name="voice-line">
<path name="voice-headphones" />
</path>
@ -2980,6 +3070,10 @@
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
</path>
<path name="mmap-playback headset">
<path name="mmap-playback headphones" />
</path>
<path name="mmap-playback speaker-and-headphones">
<path name="mmap-playback" />
<path name="mmap-playback headphones" />