Merge "msm8998: Separate BT sample rate Rx and Tx backend config" into audio-hal.lnx.5.0 (1b2d91cc) · Commits · e / devices / FP5 / android_hardware_qcom_audio

configs/msm8998/mixer_paths_skuk.xml

+36 −20

Original line number	Diff line number	Diff line
		@@ -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>

configs/msm8998/mixer_paths_tasha.xml

+40 −22

Original line number	Diff line number	Diff line
		@@ -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>

configs/msm8998/mixer_paths_tavil.xml

+40 −22

Original line number	Diff line number	Diff line
		@@ -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>