configs: msm8998: Add support to handle USB OUT device without MIC
-For voice call usecase if connected USB OUT device does not have a
mic, currently we fallback to Earpiece-Handset mic device pair.
-With tunnel mode USB support, we can instead use USB RX and
Handset Mic as a device pair for the voice call.
-Update mixer paths to use correct device based on if connected
USB device has input capability or not.
Change-Id: I01925a5f7238b5cd8e581d385a129fb96db76418
diff --git a/configs/msm8998/mixer_paths_skuk.xml b/configs/msm8998/mixer_paths_skuk.xml
index 24499b9..2acfbad 100644
--- a/configs/msm8998/mixer_paths_skuk.xml
+++ b/configs/msm8998/mixer_paths_skuk.xml
@@ -600,6 +600,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
</path>
+ <path name="deep-buffer-playback usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="deep-buffer-playback speaker-and-usb-headphones">
<path name="deep-buffer-playback usb-headphones" />
<path name="deep-buffer-playback" />
@@ -657,6 +661,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
</path>
+ <path name="low-latency-playback usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
+ </path>
+
<path name="low-latency-playback speaker-and-usb-headphones">
<path name="low-latency-playback usb-headphones" />
<path name="low-latency-playback" />
@@ -723,6 +731,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
</path>
+ <path name="audio-ull-playback usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
+ </path>
+
<path name="multi-channel-playback hdmi">
<ctl name="HDMI Mixer MultiMedia2" value="1" />
</path>
@@ -786,6 +798,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
+ </path>
+
<path name="compress-offload-playback speaker-and-usb-headphones">
<path name="compress-offload-playback usb-headphones" />
<path name="compress-offload-playback" />
@@ -847,6 +863,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
+ </path>
+
<path name="compress-offload-playback2 speaker-and-usb-headphones">
<path name="compress-offload-playback2 usb-headphones" />
<path name="compress-offload-playback2" />
@@ -908,6 +928,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
+ </path>
+
<path name="compress-offload-playback3 speaker-and-usb-headphones">
<path name="compress-offload-playback3 usb-headphones" />
<path name="compress-offload-playback3" />
@@ -970,6 +994,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
+ </path>
+
<path name="compress-offload-playback4 speaker-and-usb-headphones">
<path name="compress-offload-playback4 usb-headphones" />
<path name="compress-offload-playback4" />
@@ -1031,6 +1059,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
+ </path>
+
<path name="compress-offload-playback5 speaker-and-usb-headphones">
<path name="compress-offload-playback5 usb-headphones" />
<path name="compress-offload-playback5" />
@@ -1092,6 +1124,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
+ </path>
+
<path name="compress-offload-playback6 speaker-and-usb-headphones">
<path name="compress-offload-playback6 usb-headphones" />
<path name="compress-offload-playback6" />
@@ -1153,6 +1189,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
+ </path>
+
<path name="compress-offload-playback7 speaker-and-usb-headphones">
<path name="compress-offload-playback7 usb-headphones" />
<path name="compress-offload-playback7" />
@@ -1214,6 +1254,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
+ </path>
+
<path name="compress-offload-playback8 speaker-and-usb-headphones">
<path name="compress-offload-playback8 usb-headphones" />
<path name="compress-offload-playback8" />
@@ -1275,6 +1319,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
+ </path>
+
<path name="compress-offload-playback9 speaker-and-usb-headphones">
<path name="compress-offload-playback9 usb-headphones" />
<path name="compress-offload-playback9" />
@@ -1536,6 +1584,11 @@
<path name="compress-voip-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
+ <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
+ </path>
+
+ <path name="compress-voip-call usb-headset">
+ <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="1" />
</path>
@@ -1576,6 +1629,11 @@
<path name="voicemmode1-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
+ </path>
+
+ <path name="voicemmode1-call usb-headset">
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
</path>
@@ -1616,6 +1674,11 @@
<path name="voicemmode2-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
+ </path>
+
+ <path name="voicemmode2-call usb-headset">
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
</path>
@@ -1993,6 +2056,9 @@
<path name="usb-headphones">
</path>
+ <path name="usb-headset">
+ </path>
+
<path name="afe-proxy">
</path>
diff --git a/configs/msm8998/mixer_paths_tasha.xml b/configs/msm8998/mixer_paths_tasha.xml
index 23c0f06..6e8ec47 100644
--- a/configs/msm8998/mixer_paths_tasha.xml
+++ b/configs/msm8998/mixer_paths_tasha.xml
@@ -655,6 +655,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
</path>
+ <path name="deep-buffer-playback usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="deep-buffer-playback speaker-and-usb-headphones">
<path name="deep-buffer-playback usb-headphones" />
<path name="deep-buffer-playback" />
@@ -712,6 +716,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
</path>
+ <path name="low-latency-playback usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
+ </path>
+
<path name="low-latency-playback speaker-and-usb-headphones">
<path name="low-latency-playback usb-headphones" />
<path name="low-latency-playback" />
@@ -778,6 +786,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
</path>
+ <path name="audio-ull-playback usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
+ </path>
+
<path name="multi-channel-playback hdmi">
<ctl name="HDMI Mixer MultiMedia2" value="1" />
</path>
@@ -841,6 +853,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
+ </path>
+
<path name="compress-offload-playback speaker-and-usb-headphones">
<path name="compress-offload-playback usb-headphones" />
<path name="compress-offload-playback" />
@@ -898,6 +914,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
+ </path>
+
<path name="compress-offload-playback2 speaker-and-usb-headphones">
<path name="compress-offload-playback2 usb-headphones" />
<path name="compress-offload-playback2" />
@@ -955,6 +975,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
+ </path>
+
<path name="compress-offload-playback3 speaker-and-usb-headphones">
<path name="compress-offload-playback3 usb-headphones" />
<path name="compress-offload-playback3" />
@@ -1013,6 +1037,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
+ </path>
+
<path name="compress-offload-playback4 speaker-and-usb-headphones">
<path name="compress-offload-playback4 usb-headphones" />
<path name="compress-offload-playback4" />
@@ -1070,6 +1098,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
+ </path>
+
<path name="compress-offload-playback5 speaker-and-usb-headphones">
<path name="compress-offload-playback5 usb-headphones" />
<path name="compress-offload-playback5" />
@@ -1127,6 +1159,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
+ </path>
+
<path name="compress-offload-playback6 speaker-and-usb-headphones">
<path name="compress-offload-playback6 usb-headphones" />
<path name="compress-offload-playback6" />
@@ -1184,6 +1220,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
+ </path>
+
<path name="compress-offload-playback7 speaker-and-usb-headphones">
<path name="compress-offload-playback7 usb-headphones" />
<path name="compress-offload-playback7" />
@@ -1241,6 +1281,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
+ </path>
+
<path name="compress-offload-playback8 speaker-and-usb-headphones">
<path name="compress-offload-playback8 usb-headphones" />
<path name="compress-offload-playback8" />
@@ -1298,6 +1342,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
+ </path>
+
<path name="compress-offload-playback9 speaker-and-usb-headphones">
<path name="compress-offload-playback9 usb-headphones" />
<path name="compress-offload-playback9" />
@@ -1567,6 +1615,11 @@
<path name="compress-voip-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
+ <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
+ </path>
+
+ <path name="compress-voip-call usb-headset">
+ <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="1" />
</path>
@@ -1607,6 +1660,11 @@
<path name="vowlan-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer VoWLAN" value="1" />
+ <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
+ </path>
+
+ <path name="vowlan-call usb-headset">
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoWLAN" value="1" />
<ctl name="VoWLAN_Tx Mixer USB_AUDIO_TX_VoWLAN" value="1" />
</path>
@@ -1647,6 +1705,11 @@
<path name="voicemmode1-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
+ </path>
+
+ <path name="voicemmode1-call usb-headset">
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
</path>
@@ -1687,6 +1750,11 @@
<path name="voicemmode2-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
+ </path>
+
+ <path name="voicemmode2-call usb-headset">
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
</path>
@@ -2122,6 +2190,9 @@
<path name="usb-headphones">
</path>
+ <path name="usb-headset">
+ </path>
+
<path name="afe-proxy">
</path>
diff --git a/configs/msm8998/mixer_paths_tavil.xml b/configs/msm8998/mixer_paths_tavil.xml
index 555555d..f047feb 100644
--- a/configs/msm8998/mixer_paths_tavil.xml
+++ b/configs/msm8998/mixer_paths_tavil.xml
@@ -595,6 +595,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
</path>
+ <path name="deep-buffer-playback usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="deep-buffer-playback speaker-and-usb-headphones">
<path name="deep-buffer-playback usb-headphones" />
<path name="deep-buffer-playback" />
@@ -652,6 +656,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
</path>
+ <path name="low-latency-playback usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
+ </path>
+
<path name="low-latency-playback speaker-and-usb-headphones">
<path name="low-latency-playback usb-headphones" />
<path name="low-latency-playback" />
@@ -718,6 +726,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
</path>
+ <path name="audio-ull-playback usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
+ </path>
+
<path name="multi-channel-playback hdmi">
<ctl name="HDMI Mixer MultiMedia2" value="1" />
</path>
@@ -781,6 +793,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
+ </path>
+
<path name="compress-offload-playback speaker-and-usb-headphones">
<path name="compress-offload-playback usb-headphones" />
<path name="compress-offload-playback" />
@@ -842,6 +858,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
+ </path>
+
<path name="compress-offload-playback2 speaker-and-usb-headphones">
<path name="compress-offload-playback2 usb-headphones" />
<path name="compress-offload-playback2" />
@@ -903,6 +923,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
+ </path>
+
<path name="compress-offload-playback3 speaker-and-usb-headphones">
<path name="compress-offload-playback3 usb-headphones" />
<path name="compress-offload-playback3" />
@@ -965,6 +989,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
+ </path>
+
<path name="compress-offload-playback4 speaker-and-usb-headphones">
<path name="compress-offload-playback4 usb-headphones" />
<path name="compress-offload-playback4" />
@@ -1026,6 +1054,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
+ </path>
+
<path name="compress-offload-playback5 speaker-and-usb-headphones">
<path name="compress-offload-playback5 usb-headphones" />
<path name="compress-offload-playback5" />
@@ -1087,6 +1119,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
+ </path>
+
<path name="compress-offload-playback6 speaker-and-usb-headphones">
<path name="compress-offload-playback6 usb-headphones" />
<path name="compress-offload-playback6" />
@@ -1148,6 +1184,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
+ </path>
+
<path name="compress-offload-playback7 speaker-and-usb-headphones">
<path name="compress-offload-playback7 usb-headphones" />
<path name="compress-offload-playback7" />
@@ -1209,6 +1249,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
+ </path>
+
<path name="compress-offload-playback8 speaker-and-usb-headphones">
<path name="compress-offload-playback8 usb-headphones" />
<path name="compress-offload-playback8" />
@@ -1270,6 +1314,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 usb-headset">
+ <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
+ </path>
+
<path name="compress-offload-playback9 speaker-and-usb-headphones">
<path name="compress-offload-playback9 usb-headphones" />
<path name="compress-offload-playback9" />
@@ -1531,6 +1579,11 @@
<path name="compress-voip-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
+ <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
+ </path>
+
+ <path name="compress-voip-call usb-headset">
+ <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="1" />
</path>
@@ -1571,6 +1624,11 @@
<path name="voicemmode1-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
+ </path>
+
+ <path name="voicemmode1-call usb-headset">
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
</path>
@@ -1611,6 +1669,11 @@
<path name="voicemmode2-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
+ </path>
+
+ <path name="voicemmode2-call usb-headset">
+ <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
</path>
@@ -1984,6 +2047,9 @@
<path name="usb-headphones">
</path>
+ <path name="usb-headset">
+ </path>
+
<path name="afe-proxy">
</path>