Merge "audio: enable 5.1.2 channel mask configuration" into audio-hal.lnx.5.0
diff --git a/configs/msm8998/mixer_paths_skuk.xml b/configs/msm8998/mixer_paths_skuk.xml
index 6eb0e6f..3b1f03f 100644
--- a/configs/msm8998/mixer_paths_skuk.xml
+++ b/configs/msm8998/mixer_paths_skuk.xml
@@ -307,8 +307,6 @@
<!-- audio record compress end-->
<!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
<ctl name="SLIM7_RX ADM Channels" value="Zero" />
<!-- split a2dp end-->
@@ -584,7 +582,8 @@
</path>
<path name="deep-buffer-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="deep-buffer-playback bt-sco" />
</path>
@@ -645,7 +644,8 @@
</path>
<path name="low-latency-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-playback bt-sco" />
</path>
@@ -725,7 +725,8 @@
</path>
<path name="audio-ull-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-ull-playback bt-sco" />
</path>
@@ -802,7 +803,8 @@
</path>
<path name="compress-offload-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback bt-sco" />
</path>
@@ -877,7 +879,8 @@
</path>
<path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback2 bt-sco" />
</path>
@@ -952,7 +955,8 @@
</path>
<path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback3 bt-sco" />
</path>
@@ -1027,7 +1031,8 @@
</path>
<path name="compress-offload-playback4 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback4 bt-sco" />
</path>
@@ -1103,7 +1108,8 @@
</path>
<path name="compress-offload-playback5 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback5 bt-sco" />
</path>
@@ -1178,7 +1184,8 @@
</path>
<path name="compress-offload-playback6 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback6 bt-sco" />
</path>
@@ -1253,7 +1260,8 @@
</path>
<path name="compress-offload-playback7 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback7 bt-sco" />
</path>
@@ -1328,7 +1336,8 @@
</path>
<path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback8 bt-sco" />
</path>
@@ -1403,7 +1412,8 @@
</path>
<path name="compress-offload-playback9 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback9 bt-sco" />
</path>
@@ -1474,7 +1484,8 @@
</path>
<path name="audio-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record bt-sco" />
</path>
@@ -1491,7 +1502,8 @@
</path>
<path name="audio-record-compress bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record-compress bt-sco" />
</path>
@@ -1508,7 +1520,8 @@
</path>
<path name="low-latency-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-record bt-sco" />
</path>
@@ -1694,7 +1707,8 @@
</path>
<path name="compress-voip-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-voip-call bt-sco" />
</path>
@@ -1739,7 +1753,8 @@
</path>
<path name="voicemmode1-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode1-call bt-sco" />
</path>
@@ -1784,7 +1799,8 @@
</path>
<path name="voicemmode2-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode2-call bt-sco" />
</path>
diff --git a/configs/msm8998/mixer_paths_tasha.xml b/configs/msm8998/mixer_paths_tasha.xml
index 64d6383..6749d9e 100644
--- a/configs/msm8998/mixer_paths_tasha.xml
+++ b/configs/msm8998/mixer_paths_tasha.xml
@@ -575,8 +575,6 @@
<ctl name="SLIMBUS_5_TX LSM Function" value="None" />
<!-- listen end-->
<!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
<ctl name="SLIM7_RX ADM Channels" value="Zero" />
<!-- split a2dp end-->
@@ -662,7 +660,8 @@
</path>
<path name="deep-buffer-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="deep-buffer-playback bt-sco" />
</path>
@@ -723,7 +722,8 @@
</path>
<path name="low-latency-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-playback bt-sco" />
</path>
@@ -803,7 +803,8 @@
</path>
<path name="audio-ull-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-ull-playback bt-sco" />
</path>
@@ -880,7 +881,8 @@
</path>
<path name="compress-offload-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback bt-sco" />
</path>
@@ -951,7 +953,8 @@
</path>
<path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback2 bt-sco" />
</path>
@@ -1022,7 +1025,8 @@
</path>
<path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback3 bt-sco" />
</path>
@@ -1093,7 +1097,8 @@
</path>
<path name="compress-offload-playback4 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback4 bt-sco" />
</path>
@@ -1165,7 +1170,8 @@
</path>
<path name="compress-offload-playback5 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback5 bt-sco" />
</path>
@@ -1236,7 +1242,8 @@
</path>
<path name="compress-offload-playback6 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback6 bt-sco" />
</path>
@@ -1307,7 +1314,8 @@
</path>
<path name="compress-offload-playback7 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback7 bt-sco" />
</path>
@@ -1378,7 +1386,8 @@
</path>
<path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback8 bt-sco" />
</path>
@@ -1449,7 +1458,8 @@
</path>
<path name="compress-offload-playback9 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback9 bt-sco" />
</path>
@@ -1516,7 +1526,8 @@
</path>
<path name="audio-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record bt-sco" />
</path>
@@ -1533,7 +1544,8 @@
</path>
<path name="audio-record-compress bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record-compress bt-sco" />
</path>
@@ -1550,7 +1562,8 @@
</path>
<path name="low-latency-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-record bt-sco" />
</path>
@@ -1717,7 +1730,8 @@
</path>
<path name="hfp-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="hfp-sco" />
</path>
@@ -1748,7 +1762,8 @@
</path>
<path name="compress-voip-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-voip-call bt-sco" />
</path>
@@ -1798,7 +1813,8 @@
</path>
<path name="vowlan-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="vowlan-call bt-sco" />
</path>
@@ -1848,7 +1864,8 @@
</path>
<path name="voicemmode1-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode1-call bt-sco" />
</path>
@@ -1898,7 +1915,8 @@
</path>
<path name="voicemmode2-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode2-call bt-sco" />
</path>
diff --git a/configs/msm8998/mixer_paths_tavil.xml b/configs/msm8998/mixer_paths_tavil.xml
index 282e7e6..48a6eb1 100644
--- a/configs/msm8998/mixer_paths_tavil.xml
+++ b/configs/msm8998/mixer_paths_tavil.xml
@@ -316,8 +316,6 @@
<!-- audio record compress end-->
<!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
<ctl name="SLIM7_RX ADM Channels" value="Zero" />
<!-- split a2dp end-->
@@ -601,7 +599,8 @@
</path>
<path name="deep-buffer-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="deep-buffer-playback bt-sco" />
</path>
@@ -662,7 +661,8 @@
</path>
<path name="low-latency-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-playback bt-sco" />
</path>
@@ -742,7 +742,8 @@
</path>
<path name="audio-ull-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-ull-playback bt-sco" />
</path>
@@ -819,7 +820,8 @@
</path>
<path name="compress-offload-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback bt-sco" />
</path>
@@ -894,7 +896,8 @@
</path>
<path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback2 bt-sco" />
</path>
@@ -969,7 +972,8 @@
</path>
<path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback3 bt-sco" />
</path>
@@ -1044,7 +1048,8 @@
</path>
<path name="compress-offload-playback4 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback4 bt-sco" />
</path>
@@ -1120,7 +1125,8 @@
</path>
<path name="compress-offload-playback5 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback5 bt-sco" />
</path>
@@ -1195,7 +1201,8 @@
</path>
<path name="compress-offload-playback6 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback6 bt-sco" />
</path>
@@ -1270,7 +1277,8 @@
</path>
<path name="compress-offload-playback7 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback7 bt-sco" />
</path>
@@ -1345,7 +1353,8 @@
</path>
<path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback8 bt-sco" />
</path>
@@ -1420,7 +1429,8 @@
</path>
<path name="compress-offload-playback9 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback9 bt-sco" />
</path>
@@ -1491,7 +1501,8 @@
</path>
<path name="audio-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record bt-sco" />
</path>
@@ -1508,7 +1519,8 @@
</path>
<path name="audio-record-compress bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record-compress bt-sco" />
</path>
@@ -1525,7 +1537,8 @@
</path>
<path name="low-latency-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-record bt-sco" />
</path>
@@ -1711,7 +1724,8 @@
</path>
<path name="compress-voip-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-voip-call bt-sco" />
</path>
@@ -1761,7 +1775,8 @@
</path>
<path name="voicemmode1-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode1-call bt-sco" />
</path>
@@ -1811,7 +1826,8 @@
</path>
<path name="voicemmode2-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode2-call bt-sco" />
</path>
@@ -2741,7 +2757,8 @@
</path>
<path name="mmap-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="mmap-playback bt-sco" />
</path>
@@ -2789,7 +2806,8 @@
</path>
<path name="mmap-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="mmap-record bt-sco" />
</path>
diff --git a/configs/msmnile/msmnile.mk b/configs/msmnile/msmnile.mk
index 135b7e1..f71e1d2 100644
--- a/configs/msmnile/msmnile.mk
+++ b/configs/msmnile/msmnile.mk
@@ -231,4 +231,4 @@
android.hardware.audio@2.0-service \
android.hardware.audio@2.0-impl \
android.hardware.audio.effect@2.0-impl \
- android.hardware.soundtrigger@2.0-impl
+ android.hardware.soundtrigger@2.1-impl
diff --git a/configs/sdm660/mixer_paths.xml b/configs/sdm660/mixer_paths.xml
index d1b662d..1327507 100644
--- a/configs/sdm660/mixer_paths.xml
+++ b/configs/sdm660/mixer_paths.xml
@@ -277,8 +277,6 @@
<!-- audio record compress end-->
<!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
<ctl name="SLIM7_RX ADM Channels" value="Zero" />
<!-- split a2dp end-->
@@ -453,7 +451,8 @@
</path>
<path name="deep-buffer-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="deep-buffer-playback bt-sco" />
</path>
@@ -504,7 +503,8 @@
</path>
<path name="low-latency-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-playback bt-sco" />
</path>
@@ -574,7 +574,8 @@
</path>
<path name="audio-ull-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-ull-playback bt-sco" />
</path>
@@ -641,7 +642,8 @@
</path>
<path name="compress-offload-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback bt-sco" />
</path>
@@ -705,7 +707,8 @@
</path>
<path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback2 bt-sco" />
</path>
@@ -769,7 +772,8 @@
</path>
<path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback3 bt-sco" />
</path>
@@ -833,7 +837,8 @@
</path>
<path name="compress-offload-playback4 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback4 bt-sco" />
</path>
@@ -898,7 +903,8 @@
</path>
<path name="compress-offload-playback5 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback5 bt-sco" />
</path>
@@ -962,7 +968,8 @@
</path>
<path name="compress-offload-playback6 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback6 bt-sco" />
</path>
@@ -1026,7 +1033,8 @@
</path>
<path name="compress-offload-playback7 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback7 bt-sco" />
</path>
@@ -1090,7 +1098,8 @@
</path>
<path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback8 bt-sco" />
</path>
@@ -1154,7 +1163,8 @@
</path>
<path name="compress-offload-playback9 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback9 bt-sco" />
</path>
@@ -1214,7 +1224,8 @@
</path>
<path name="audio-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record bt-sco" />
</path>
@@ -1231,7 +1242,8 @@
</path>
<path name="audio-record-compress bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record-compress bt-sco" />
</path>
@@ -1248,7 +1260,8 @@
</path>
<path name="low-latency-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-record bt-sco" />
</path>
@@ -1446,7 +1459,8 @@
</path>
<path name="compress-voip-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-voip-call bt-sco" />
</path>
@@ -1496,7 +1510,8 @@
</path>
<path name="voicemmode1-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode1-call bt-sco" />
</path>
@@ -1546,7 +1561,8 @@
</path>
<path name="voicemmode2-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode2-call bt-sco" />
</path>
@@ -2278,7 +2294,8 @@
</path>
<path name="mmap-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="16000" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="mmap-playback bt-sco" />
</path>
@@ -2303,6 +2320,8 @@
</path>
<path name="mmap-record bt-sco-wb">
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<ctl name="AUX PCM SampleRate" value="16000" />
<path name="mmap-record bt-sco" />
</path>
diff --git a/configs/sdm660/mixer_paths_mtp.xml b/configs/sdm660/mixer_paths_mtp.xml
index fba8372..e9e508a 100644
--- a/configs/sdm660/mixer_paths_mtp.xml
+++ b/configs/sdm660/mixer_paths_mtp.xml
@@ -276,8 +276,6 @@
<!-- audio record compress end-->
<!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
<ctl name="SLIM7_RX ADM Channels" value="Zero" />
<!-- split a2dp end-->
@@ -452,7 +450,8 @@
</path>
<path name="deep-buffer-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="deep-buffer-playback bt-sco" />
</path>
@@ -513,7 +512,8 @@
</path>
<path name="low-latency-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-playback bt-sco" />
</path>
@@ -593,7 +593,8 @@
</path>
<path name="audio-ull-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-ull-playback bt-sco" />
</path>
@@ -670,7 +671,8 @@
</path>
<path name="compress-offload-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback bt-sco" />
</path>
@@ -744,7 +746,8 @@
</path>
<path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback2 bt-sco" />
</path>
@@ -818,7 +821,8 @@
</path>
<path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback3 bt-sco" />
</path>
@@ -892,7 +896,8 @@
</path>
<path name="compress-offload-playback4 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback4 bt-sco" />
</path>
@@ -967,7 +972,8 @@
</path>
<path name="compress-offload-playback5 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback5 bt-sco" />
</path>
@@ -1041,7 +1047,8 @@
</path>
<path name="compress-offload-playback6 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback6 bt-sco" />
</path>
@@ -1115,7 +1122,8 @@
</path>
<path name="compress-offload-playback7 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback7 bt-sco" />
</path>
@@ -1189,7 +1197,8 @@
</path>
<path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback8 bt-sco" />
</path>
@@ -1263,7 +1272,8 @@
</path>
<path name="compress-offload-playback9 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback9 bt-sco" />
</path>
@@ -1333,7 +1343,8 @@
</path>
<path name="audio-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record bt-sco" />
</path>
@@ -1350,7 +1361,8 @@
</path>
<path name="audio-record-compress bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record-compress bt-sco" />
</path>
@@ -1367,7 +1379,8 @@
</path>
<path name="low-latency-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-record bt-sco" />
</path>
@@ -1565,7 +1578,8 @@
</path>
<path name="compress-voip-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-voip-call bt-sco" />
</path>
@@ -1615,7 +1629,8 @@
</path>
<path name="voicemmode1-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode1-call bt-sco" />
</path>
@@ -1665,7 +1680,8 @@
</path>
<path name="voicemmode2-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode2-call bt-sco" />
</path>
diff --git a/configs/sdm660/mixer_paths_skus.xml b/configs/sdm660/mixer_paths_skus.xml
index 173e268..4df8d2f 100644
--- a/configs/sdm660/mixer_paths_skus.xml
+++ b/configs/sdm660/mixer_paths_skus.xml
@@ -577,8 +577,6 @@
<ctl name="SLIMBUS_5_TX LSM Function" value="None" />
<!-- listen end-->
<!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
<ctl name="SLIM7_RX ADM Channels" value="Zero" />
<!-- split a2dp end-->
@@ -656,7 +654,8 @@
</path>
<path name="deep-buffer-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="deep-buffer-playback bt-sco" />
</path>
@@ -717,7 +716,8 @@
</path>
<path name="low-latency-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-playback bt-sco" />
</path>
@@ -797,7 +797,8 @@
</path>
<path name="audio-ull-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-ull-playback bt-sco" />
</path>
@@ -875,7 +876,8 @@
</path>
<path name="compress-offload-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback bt-sco" />
</path>
@@ -946,7 +948,8 @@
</path>
<path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback2 bt-sco" />
</path>
@@ -1017,7 +1020,8 @@
</path>
<path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback3 bt-sco" />
</path>
@@ -1088,7 +1092,8 @@
</path>
<path name="compress-offload-playback4 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback4 bt-sco" />
</path>
@@ -1160,7 +1165,8 @@
</path>
<path name="compress-offload-playback5 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback5 bt-sco" />
</path>
@@ -1231,7 +1237,8 @@
</path>
<path name="compress-offload-playback6 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback6 bt-sco" />
</path>
@@ -1302,7 +1309,8 @@
</path>
<path name="compress-offload-playback7 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback7 bt-sco" />
</path>
@@ -1373,7 +1381,8 @@
</path>
<path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback8 bt-sco" />
</path>
@@ -1444,7 +1453,8 @@
</path>
<path name="compress-offload-playback9 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback9 bt-sco" />
</path>
@@ -1511,7 +1521,8 @@
</path>
<path name="audio-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record bt-sco" />
</path>
@@ -1528,7 +1539,8 @@
</path>
<path name="audio-record-compress bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record-compress bt-sco" />
</path>
@@ -1545,7 +1557,8 @@
</path>
<path name="low-latency-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-record bt-sco" />
</path>
@@ -1743,7 +1756,8 @@
</path>
<path name="compress-voip-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-voip-call bt-sco" />
</path>
@@ -1833,7 +1847,8 @@
</path>
<path name="voicemmode1-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode1-call bt-sco" />
</path>
@@ -1878,7 +1893,8 @@
</path>
<path name="voicemmode2-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode2-call bt-sco" />
</path>
diff --git a/configs/sdm660/mixer_paths_skush.xml b/configs/sdm660/mixer_paths_skush.xml
index 1858ecb..e24c35c 100644
--- a/configs/sdm660/mixer_paths_skush.xml
+++ b/configs/sdm660/mixer_paths_skush.xml
@@ -268,8 +268,6 @@
<!-- audio record compress end-->
<!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
<ctl name="SLIM7_RX ADM Channels" value="Zero" />
<!-- split a2dp end-->
@@ -452,7 +450,8 @@
</path>
<path name="deep-buffer-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="deep-buffer-playback bt-sco" />
</path>
@@ -517,7 +516,8 @@
</path>
<path name="low-latency-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-playback bt-sco" />
</path>
@@ -601,7 +601,8 @@
</path>
<path name="audio-ull-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-ull-playback bt-sco" />
</path>
@@ -682,7 +683,8 @@
</path>
<path name="compress-offload-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback bt-sco" />
</path>
@@ -760,7 +762,8 @@
</path>
<path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback2 bt-sco" />
</path>
@@ -838,7 +841,8 @@
</path>
<path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback3 bt-sco" />
</path>
@@ -916,7 +920,8 @@
</path>
<path name="compress-offload-playback4 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback4 bt-sco" />
</path>
@@ -995,7 +1000,8 @@
</path>
<path name="compress-offload-playback5 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback5 bt-sco" />
</path>
@@ -1073,7 +1079,8 @@
</path>
<path name="compress-offload-playback6 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback6 bt-sco" />
</path>
@@ -1151,7 +1158,8 @@
</path>
<path name="compress-offload-playback7 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback7 bt-sco" />
</path>
@@ -1229,7 +1237,8 @@
</path>
<path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback8 bt-sco" />
</path>
@@ -1307,7 +1316,8 @@
</path>
<path name="compress-offload-playback9 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback9 bt-sco" />
</path>
@@ -1377,7 +1387,8 @@
</path>
<path name="audio-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record bt-sco" />
</path>
@@ -1394,7 +1405,8 @@
</path>
<path name="audio-record-compress bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record-compress bt-sco" />
</path>
@@ -1411,7 +1423,8 @@
</path>
<path name="low-latency-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-record bt-sco" />
</path>
@@ -1613,7 +1626,8 @@
</path>
<path name="compress-voip-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-voip-call bt-sco" />
</path>
@@ -1668,7 +1682,8 @@
</path>
<path name="voicemmode1-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode1-call bt-sco" />
</path>
@@ -1723,7 +1738,8 @@
</path>
<path name="voicemmode2-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode2-call bt-sco" />
</path>
diff --git a/configs/sdm660/mixer_paths_wcd9335.xml b/configs/sdm660/mixer_paths_wcd9335.xml
index a05f3cb..3ce9672 100644
--- a/configs/sdm660/mixer_paths_wcd9335.xml
+++ b/configs/sdm660/mixer_paths_wcd9335.xml
@@ -576,8 +576,6 @@
<ctl name="SLIMBUS_5_TX LSM Function" value="None" />
<!-- listen end-->
<!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
<ctl name="SLIM7_RX ADM Channels" value="Zero" />
<!-- split a2dp end-->
@@ -663,7 +661,8 @@
</path>
<path name="deep-buffer-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="deep-buffer-playback bt-sco" />
</path>
@@ -714,7 +713,8 @@
</path>
<path name="low-latency-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-playback bt-sco" />
</path>
@@ -784,7 +784,8 @@
</path>
<path name="audio-ull-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-ull-playback bt-sco" />
</path>
@@ -851,7 +852,8 @@
</path>
<path name="compress-offload-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback bt-sco" />
</path>
@@ -912,7 +914,8 @@
</path>
<path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback2 bt-sco" />
</path>
@@ -973,7 +976,8 @@
</path>
<path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback3 bt-sco" />
</path>
@@ -1034,7 +1038,8 @@
</path>
<path name="compress-offload-playback4 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback4 bt-sco" />
</path>
@@ -1096,7 +1101,8 @@
</path>
<path name="compress-offload-playback5 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback5 bt-sco" />
</path>
@@ -1157,7 +1163,8 @@
</path>
<path name="compress-offload-playback6 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback6 bt-sco" />
</path>
@@ -1218,7 +1225,8 @@
</path>
<path name="compress-offload-playback7 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback7 bt-sco" />
</path>
@@ -1279,7 +1287,8 @@
</path>
<path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback8 bt-sco" />
</path>
@@ -1340,7 +1349,8 @@
</path>
<path name="compress-offload-playback9 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback9 bt-sco" />
</path>
@@ -1397,7 +1407,8 @@
</path>
<path name="audio-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record bt-sco" />
</path>
@@ -1414,7 +1425,8 @@
</path>
<path name="audio-record-compress bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record-compress bt-sco" />
</path>
@@ -1431,7 +1443,8 @@
</path>
<path name="low-latency-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-record bt-sco" />
</path>
@@ -1629,7 +1642,8 @@
</path>
<path name="compress-voip-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-voip-call bt-sco" />
</path>
@@ -1729,7 +1743,8 @@
</path>
<path name="voicemmode1-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode1-call bt-sco" />
</path>
@@ -1779,7 +1794,8 @@
</path>
<path name="voicemmode2-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode2-call bt-sco" />
</path>
@@ -2835,7 +2851,8 @@
</path>
<path name="mmap-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="16000" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="mmap-playback bt-sco" />
</path>
@@ -2860,7 +2877,8 @@
</path>
<path name="mmap-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="mmap-record bt-sco" />
</path>
diff --git a/configs/sdm660/mixer_paths_wcd9340.xml b/configs/sdm660/mixer_paths_wcd9340.xml
index 8f68011..d505ada 100644
--- a/configs/sdm660/mixer_paths_wcd9340.xml
+++ b/configs/sdm660/mixer_paths_wcd9340.xml
@@ -316,8 +316,6 @@
<!-- audio record compress end-->
<!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
<ctl name="SLIM7_RX ADM Channels" value="Zero" />
<!-- split a2dp end-->
@@ -598,7 +596,8 @@
</path>
<path name="deep-buffer-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="deep-buffer-playback bt-sco" />
</path>
@@ -649,7 +648,8 @@
</path>
<path name="low-latency-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-playback bt-sco" />
</path>
@@ -719,7 +719,8 @@
</path>
<path name="audio-ull-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-ull-playback bt-sco" />
</path>
@@ -786,7 +787,8 @@
</path>
<path name="compress-offload-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback bt-sco" />
</path>
@@ -851,7 +853,8 @@
</path>
<path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback2 bt-sco" />
</path>
@@ -916,7 +919,8 @@
</path>
<path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback3 bt-sco" />
</path>
@@ -981,7 +985,8 @@
</path>
<path name="compress-offload-playback4 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback4 bt-sco" />
</path>
@@ -1047,7 +1052,8 @@
</path>
<path name="compress-offload-playback5 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback5 bt-sco" />
</path>
@@ -1112,7 +1118,8 @@
</path>
<path name="compress-offload-playback6 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback6 bt-sco" />
</path>
@@ -1177,7 +1184,8 @@
</path>
<path name="compress-offload-playback7 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback7 bt-sco" />
</path>
@@ -1242,7 +1250,8 @@
</path>
<path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback8 bt-sco" />
</path>
@@ -1307,7 +1316,8 @@
</path>
<path name="compress-offload-playback9 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-offload-playback9 bt-sco" />
</path>
@@ -1368,7 +1378,8 @@
</path>
<path name="audio-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record bt-sco" />
</path>
@@ -1385,7 +1396,8 @@
</path>
<path name="audio-record-compress bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="audio-record-compress bt-sco" />
</path>
@@ -1402,7 +1414,8 @@
</path>
<path name="low-latency-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="low-latency-record bt-sco" />
</path>
@@ -1600,7 +1613,8 @@
</path>
<path name="compress-voip-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="compress-voip-call bt-sco" />
</path>
@@ -1650,7 +1664,8 @@
</path>
<path name="voicemmode1-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode1-call bt-sco" />
</path>
@@ -1700,7 +1715,8 @@
</path>
<path name="voicemmode2-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<path name="voicemmode2-call bt-sco" />
</path>
@@ -2582,6 +2598,8 @@
</path>
<path name="mmap-playback bt-sco-wb">
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<ctl name="AUX PCM SampleRate" value="16000" />
<path name="mmap-playback bt-sco" />
</path>
@@ -2607,6 +2625,8 @@
</path>
<path name="mmap-record bt-sco-wb">
+ <ctl name="BT SampleRate RX" value="KHZ_16" />
+ <ctl name="BT SampleRate TX" value="KHZ_16" />
<ctl name="AUX PCM SampleRate" value="16000" />
<path name="mmap-record bt-sco" />
</path>
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 212c7f5..caf7848 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1425,6 +1425,11 @@
usecase->out_snd_device,
platform_get_input_snd_device(adev->platform, uc_info->devices));
enable_audio_route(adev, usecase);
+ if (usecase->id == USECASE_AUDIO_PLAYBACK_VOIP) {
+ out_set_voip_volume(&usecase->stream.out->stream,
+ usecase->stream.out->volume_l,
+ usecase->stream.out->volume_r);
+ }
if (usecase->id == USECASE_AUDIO_PLAYBACK_FM) {
struct str_parms *parms = str_parms_create_str("fm_restore_volume=1");
if (parms)