From: Danny Wood <danwood76@gmail.com>
Date: Tue, 19 Oct 2021 11:37:33 +0000 (+0100)
Subject: j7elte: Fixup audio mixer paths
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=298974e4dd8c20e7af3763f5def87773097fc690;p=GitHub%2FLineageOS%2Fandroid_device_samsung_j7elte.git

j7elte: Fixup audio mixer paths

* Headset mic gains set to stock values
* Speaker volumes increased
* Some missing parameters copied from stock

Change-Id: Iab368111b93d46c48dbeea5fbff1e557d7e85bdd
---

diff --git a/configs/audio/mixer_paths.xml b/configs/audio/mixer_paths.xml
index ff844c2..4dd0c4e 100644
--- a/configs/audio/mixer_paths.xml
+++ b/configs/audio/mixer_paths.xml
@@ -144,24 +144,28 @@
 	</path>
 
 	<path name="dev-speaker">
+		<path name="dev-codec-disable-analog-bypass" />
 		<ctl name="HP HP On" value="0" />
 		<ctl name="EP EP On" value="0" />
 		<ctl name="SPK SPK On" value="1" />
 	</path>
 
 	<path name="dev-handset">
+		<path name="dev-codec-disable-analog-bypass" />
 		<ctl name="HP HP On" value="0" />
 		<ctl name="SPK SPK On" value="0" />
 		<ctl name="EP EP On" value="1" />
 	</path>
 
 	<path name="dev-headset">
+		<path name="dev-codec-disable-analog-bypass" />
 		<ctl name="EP EP On" value="0" />
 		<ctl name="SPK SPK On" value="0" />
 		<ctl name="HP HP On" value="1" />
 	</path>
 
 	<path name="dev-speaker-headset">
+		<path name="dev-codec-disable-analog-bypass" />
 		<ctl name="EP EP On" value="0" />
 		<ctl name="HP HP On" value="1" />
 		<ctl name="SPK SPK On" value="1" />
@@ -180,6 +184,7 @@
 	</path>
 
 	<path name="dev-codec-out-disable">
+		<path name="dev-codec-disable-analog-bypass" />
 		<ctl name="HP HP On" value="0" />
 		<ctl name="EP EP On" value="0" />
 		<ctl name="SPK SPK On" value="0" />
@@ -291,8 +296,6 @@
 
 	<path name="media-headset">
 		<path name="route-ap-tx" />
-		<ctl name="Chargepump Mode" value="VDD" />
-		<ctl name="DNC Max Gain" value="6" />
 		<path name="dev-headset" />
 	</path>
 
@@ -577,8 +580,6 @@
 
 	<path name="incall_nb-headphone">
 		<path name="incall_nb-headset" />
-		<ctl name="Chargepump Mode" value="VDD" />
-		<ctl name="DNC Max Gain" value="9" />
 	</path>
 
 	<path name="incall_nb-bt-sco-headset">
@@ -624,14 +625,10 @@
 
 	<path name="incall_wb-headset">
 		<path name="incall_nb-headset" />
-		<ctl name="Chargepump Mode" value="VDD" />
-		<ctl name="DNC Max Gain" value="9" />
 	</path>
 
 	<path name="incall_wb-headphone">
 		<path name="incall_nb-headphone" />
-		<ctl name="Chargepump Mode" value="VDD" />
-		<ctl name="DNC Max Gain" value="9" />
 	</path>
 
 	<path name="incall_wb-bt-sco-headset">
@@ -1550,19 +1547,20 @@
 	<path name="gain-media-speaker">
 		<ctl name="S2801 MIX1_LVL" value="0" />
 		<ctl name="DAC Gain" value="132" />
-		<ctl name="Speaker Volume" value="0" />
+		<ctl name="Speaker Volume" value="6" />
 	</path>
 
 	<path name="gain-media-headset">
 		<ctl name="S2801 MIX1_LVL" value="0" />
 		<ctl name="DAC Gain" value="122" />
+		<ctl name="Headphone Volume" value="36" />
 	</path>
 
 	<path name="gain-media-speaker-headset">
 		<ctl name="S2801 MIX1_LVL" value="0" />
 		<ctl name="DAC Gain" value="132" />
-		<ctl name="Speaker Volume" value="0" />
-		<ctl name="Headphone Volume" value="23" />
+		<ctl name="Speaker Volume" value="6" />
+		<ctl name="Headphone Volume" value="36" />
 	</path>
 
 	<path name="gain-media-bt-sco-headset">
@@ -1571,8 +1569,8 @@
 
 	<path name="gain-media-speaker-bt-sco-headset">
 		<ctl name="S2801 MIX1_LVL" value="0" />
-		<ctl name="DAC Gain" value="127" />
-		<ctl name="Speaker Volume" value="3" />
+		<ctl name="DAC Gain" value="132" />
+		<ctl name="Speaker Volume" value="6" />
 	</path>
 
 	<!-- Ringtone playback volume -->
@@ -1590,14 +1588,15 @@
 
 	<path name="gain-ringtone-headset">
 		<ctl name="S2801 MIX1_LVL" value="0" />
-		<ctl name="DAC Gain" value="127" />
+		<ctl name="DAC Gain" value="105" />
+		<ctl name="Headphone Volume" value="36" />
 	</path>
 
 	<path name="gain-ringtone-speaker-headset">
 		<ctl name="S2801 MIX1_LVL" value="0" />
 		<ctl name="DAC Gain" value="127" />
-		<ctl name="Speaker Volume" value="0" />
-		<ctl name="Headphone Volume" value="21" />
+		<ctl name="Speaker Volume" value="6" />
+		<ctl name="Headphone Volume" value="36" />
 	</path>
 
 	<path name="gain-ringtone-bt-sco-headset">
@@ -2080,7 +2079,7 @@
 	<path name="gain-incall_nb-speaker">
 		<ctl name="S2801 MIX1_LVL" value="0" />
 		<ctl name="S2801 MIX2_LVL" value="0" />
-		<ctl name="DAC Gain" value="118" />
+		<ctl name="DAC Gain" value="127" />
 		<ctl name="Speaker Volume" value="6" />
 	</path>
 
@@ -2088,12 +2087,14 @@
 		<ctl name="S2801 MIX1_LVL" value="0" />
 		<ctl name="S2801 MIX2_LVL" value="0" />
 		<ctl name="DAC Gain" value="127" />
+		<ctl name="Headphone Volume" value="36" />
 	</path>
 
 	<path name="gain-incall_nb-headphone">
 		<ctl name="S2801 MIX1_LVL" value="0" />
 		<ctl name="S2801 MIX2_LVL" value="0" />
 		<ctl name="DAC Gain" value="127" />
+		<ctl name="Headphone Volume" value="36" />
 	</path>
 
 	<path name="gain-incall_nb-bt-sco-headset">
@@ -2157,7 +2158,7 @@
 	<path name="gain-incall_wb-speaker">
 		<ctl name="S2801 MIX1_LVL" value="0" />
 		<ctl name="S2801 MIX2_LVL" value="0" />
-		<ctl name="DAC Gain" value="118" />
+		<ctl name="DAC Gain" value="127" />
 		<ctl name="Speaker Volume" value="6" />
 	</path>
 
@@ -2165,12 +2166,14 @@
 		<ctl name="S2801 MIX1_LVL" value="0" />
 		<ctl name="S2801 MIX2_LVL" value="0" />
 		<ctl name="DAC Gain" value="127" />
+		<ctl name="Headphone Volume" value="36" />
 	</path>
 
 	<path name="gain-incall_wb-headphone">
 		<ctl name="S2801 MIX1_LVL" value="0" />
 		<ctl name="S2801 MIX2_LVL" value="0" />
 		<ctl name="DAC Gain" value="127" />
+		<ctl name="Headphone Volume" value="36" />
 	</path>
 
 	<path name="gain-incall_wb-bt-sco-headset">
@@ -2274,7 +2277,7 @@
 	</path>
 
 	<path name="gain-media-headset-mic">
-		<ctl name="MIC2 Volume" value="4" />
+		<ctl name="MIC2 Volume" value="11" />
 		<ctl name="MIC2 Boost Volume" value="2" />
 		<ctl name="ADC Left Gain" value="127" />
 		<ctl name="ADC Right Gain" value="127" />
@@ -2293,50 +2296,47 @@
 
 	<!-- camcorder input volume -->
 	<path name="gain-camcorder-mic-oe">
-		<ctl name="MIC1 Volume" value="12" />
-		<ctl name="MIC1 Boost Volume" value="1" />
--		<ctl name="Line-in Volume" value="4" />
-		<ctl name="ADC Left Gain" value="137" />
-		<ctl name="ADC Right Gain" value="137" />
+		<ctl name="MIC1 Volume" value="14" />
+		<ctl name="MIC1 Boost Volume" value="0" />
+		<ctl name="ADC Left Gain" value="150" />
+		<ctl name="ADC Right Gain" value="150" />
 	</path>
 
 	<path name="gain-camcorder-headset-mic">
-		<ctl name="MIC2 Volume" value="7" />
+		<ctl name="MIC2 Volume" value="11" />
 		<ctl name="MIC2 Boost Volume" value="2" />
-		<ctl name="ADC Left Gain" value="136" />
-		<ctl name="ADC Right Gain" value="136" />
+		<ctl name="ADC Left Gain" value="127" />
+		<ctl name="ADC Right Gain" value="127" />
 	</path>
 
 	<path name="gain-camcorder-headphone-mic">
-		<ctl name="MIC1 Volume" value="10" />
-		<ctl name="MIC1 Boost Volume" value="1" />
-		<ctl name="Line-in Volume" value="4" />
-		<ctl name="ADC Left Gain" value="136" />
-		<ctl name="ADC Right Gain" value="136" />
+		<ctl name="MIC1 Volume" value="14" />
+		<ctl name="MIC1 Boost Volume" value="0" />
+		<ctl name="ADC Left Gain" value="150" />
+		<ctl name="ADC Right Gain" value="150" />
 	</path>
 
 	<!-- voice recording input volume -->
 
 	<path name="gain-recording-mic">
-		<ctl name="MIC1 Volume" value="10" />
-		<ctl name="MIC1 Boost Volume" value="1" />
-		<ctl name="ADC Left Gain" value="138" />
-		<ctl name="ADC Right Gain" value="138" />
-
+		<ctl name="MIC1 Volume" value="14" />
+		<ctl name="MIC1 Boost Volume" value="0" />
+		<ctl name="ADC Left Gain" value="150" />
+		<ctl name="ADC Right Gain" value="150" />
 	</path>
 
 	<path name="gain-recording-headset-mic">
-		<ctl name="MIC2 Volume" value="7" />
+		<ctl name="MIC2 Volume" value="11" />
 		<ctl name="MIC2 Boost Volume" value="2" />
-		<ctl name="ADC Left Gain" value="136" />
-		<ctl name="ADC Right Gain" value="136" />
+		<ctl name="ADC Left Gain" value="127" />
+		<ctl name="ADC Right Gain" value="127" />
 	</path>
 
 	<path name="gain-recording-headphone-mic">
-		<ctl name="MIC1 Volume" value="10" />
-		<ctl name="MIC1 Boost Volume" value="1" />
-		<ctl name="ADC Left Gain" value="138" />
-		<ctl name="ADC Right Gain" value="138" />
+		<ctl name="MIC1 Volume" value="14" />
+		<ctl name="MIC1 Boost Volume" value="0" />
+		<ctl name="ADC Left Gain" value="150" />
+		<ctl name="ADC Right Gain" value="150" />
 	</path>
 
 	<path name="gain-recording-bt-sco-headset-in">
@@ -3102,9 +3102,8 @@
 	<path name="gain-incall_nb-handset-mic">
 		<ctl name="S2801 RMIX1_LVL" value="0" />
 		<ctl name="S2801 RMIX2_LVL" value="0" />
-		<ctl name="MIC1 Volume" value="17" />
-		<ctl name="MIC1 Boost Volume" value="1" />
-		<ctl name="Line-in Volume" value="6" />
+		<ctl name="MIC1 Volume" value="11" />
+		<ctl name="MIC1 Boost Volume" value="2" />
 		<ctl name="ADC Left Gain" value="127" />
 		<ctl name="ADC Right Gain" value="127" />
 	</path>
@@ -3112,11 +3111,10 @@
 	<path name="gain-incall_nb-speaker-mic">
 		<ctl name="S2801 RMIX1_LVL" value="0" />
 		<ctl name="S2801 RMIX2_LVL" value="0" />
-		<ctl name="MIC1 Volume" value="13" />
-		<ctl name="MIC1 Boost Volume" value="0" />
-		<ctl name="Line-in Volume" value="6" />
-		<ctl name="ADC Left Gain" value="129" />
-		<ctl name="ADC Right Gain" value="129" />
+		<ctl name="MIC1 Volume" value="11" />
+		<ctl name="MIC1 Boost Volume" value="1" />
+		<ctl name="ADC Left Gain" value="135" />
+		<ctl name="ADC Right Gain" value="135" />
 	</path>
 
 	<path name="gain-incall_nb-headset-mic">
@@ -3124,15 +3122,15 @@
 		<ctl name="S2801 RMIX2_LVL" value="0" />
 		<ctl name="MIC2 Volume" value="11" />
 		<ctl name="MIC2 Boost Volume" value="1" />
-		<ctl name="ADC Left Gain" value="127" />
-		<ctl name="ADC Right Gain" value="127" />
+		<ctl name="ADC Left Gain" value="139" />
+		<ctl name="ADC Right Gain" value="139" />
 	</path>
 
 	<path name="gain-incall_nb-headphone-mic">
 		<ctl name="S2801 RMIX1_LVL" value="0" />
 		<ctl name="S2801 RMIX2_LVL" value="0" />
-		<ctl name="MIC1 Volume" value="17" />
-		<ctl name="MIC1 Boost Volume" value="1" />
+		<ctl name="MIC1 Volume" value="11" />
+		<ctl name="MIC1 Boost Volume" value="2" />
 		<ctl name="ADC Left Gain" value="127" />
 		<ctl name="ADC Right Gain" value="127" />
 	</path>
@@ -3209,9 +3207,8 @@
 	<path name="gain-incall_wb-handset-mic">
 		<ctl name="S2801 RMIX1_LVL" value="0" />
 		<ctl name="S2801 RMIX2_LVL" value="0" />
-		<ctl name="MIC1 Volume" value="17" />
-		<ctl name="MIC1 Boost Volume" value="1" />
-		<ctl name="Line-in Volume" value="6" />
+		<ctl name="MIC1 Volume" value="11" />
+		<ctl name="MIC1 Boost Volume" value="2" />
 		<ctl name="ADC Left Gain" value="127" />
 		<ctl name="ADC Right Gain" value="127" />
 	</path>
@@ -3219,9 +3216,8 @@
 	<path name="gain-incall_wb-speaker-mic">
 		<ctl name="S2801 RMIX1_LVL" value="0" />
 		<ctl name="S2801 RMIX2_LVL" value="0" />
-		<ctl name="MIC1 Volume" value="13" />
-		<ctl name="MIC1 Boost Volume" value="0" />
-		<ctl name="Line-in Volume" value="6" />
+		<ctl name="MIC1 Volume" value="11" />
+		<ctl name="MIC1 Boost Volume" value="2" />
 		<ctl name="ADC Left Gain" value="127" />
 		<ctl name="ADC Right Gain" value="127" />
 	</path>
@@ -3238,8 +3234,8 @@
 	<path name="gain-incall_wb-headphone-mic">
 		<ctl name="S2801 RMIX1_LVL" value="0" />
 		<ctl name="S2801 RMIX2_LVL" value="0" />
-		<ctl name="MIC1 Volume" value="17" />
-		<ctl name="MIC1 Boost Volume" value="1" />
+		<ctl name="MIC1 Volume" value="11" />
+		<ctl name="MIC1 Boost Volume" value="2" />
 		<ctl name="ADC Left Gain" value="127" />
 		<ctl name="ADC Right Gain" value="127" />
 	</path>