Revert "rtwo: audio: Increase mic volumes further"

This reverts commit 7157ddab8c.

It turns out it's a bit too much boost and can cause distortion for some users

Change-Id: Ie0e037bb43becc8851fd1d06c7590cae14f71392
This commit is contained in:
Marc Bourgoin
2024-07-05 05:24:38 -06:00
parent b135ce2440
commit 4ae44ab6a2
2 changed files with 78 additions and 78 deletions

View File

@@ -201,24 +201,24 @@
<ctl name="HPHL Volume" value="16" />
<ctl name="HPHR Volume" value="16" />
<ctl name="TX_DEC0 Volume" value="92" />
<ctl name="TX_DEC1 Volume" value="92" />
<ctl name="TX_DEC2 Volume" value="92" />
<ctl name="TX_DEC3 Volume" value="92" />
<ctl name="TX_DEC4 Volume" value="92" />
<ctl name="TX_DEC5 Volume" value="92" />
<ctl name="TX_DEC6 Volume" value="92" />
<ctl name="TX_DEC7 Volume" value="92" />
<ctl name="TX_DEC0 Volume" value="87" />
<ctl name="TX_DEC1 Volume" value="87" />
<ctl name="TX_DEC2 Volume" value="87" />
<ctl name="TX_DEC3 Volume" value="87" />
<ctl name="TX_DEC4 Volume" value="87" />
<ctl name="TX_DEC5 Volume" value="87" />
<ctl name="TX_DEC6 Volume" value="87" />
<ctl name="TX_DEC7 Volume" value="87" />
<ctl name="ADC1 Volume" value="20" />
<ctl name="ADC2 Volume" value="20" />
<ctl name="ADC3 Volume" value="20" />
<ctl name="ADC4 Volume" value="20" />
<ctl name="ADC1 Volume" value="15" />
<ctl name="ADC2 Volume" value="15" />
<ctl name="ADC3 Volume" value="15" />
<ctl name="ADC4 Volume" value="15" />
<ctl name="VA_DEC0 Volume" value="92" />
<ctl name="VA_DEC1 Volume" value="92" />
<ctl name="VA_DEC2 Volume" value="92" />
<ctl name="VA_DEC3 Volume" value="92" />
<ctl name="VA_DEC0 Volume" value="87" />
<ctl name="VA_DEC1 Volume" value="87" />
<ctl name="VA_DEC2 Volume" value="87" />
<ctl name="VA_DEC3 Volume" value="87" />
<!-- Compander controls -->
<ctl name="WSA_COMP1 Switch" value="0" />
@@ -652,7 +652,7 @@
</path>
<path name="headset-mic">
<ctl name="TX_DEC0 Volume" value="100" />
<ctl name="TX_DEC0 Volume" value="95" />
<path name="amic2" />
</path>
@@ -865,7 +865,7 @@
<ctl name="VA SMIC MUX0" value="SWR_MIC4" />
<ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" />
<ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="ADC1 Volume" value="18" />
<ctl name="ADC1 Volume" value="13" />
<ctl name="VA_AMIC1_MIXER Switch" value="1" />
</path>
@@ -882,8 +882,8 @@
<ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
<ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="ADC4_MIXER Switch" value="1" />
<ctl name="ADC1 Volume" value="24" />
<ctl name="ADC4 Volume" value="24" />
<ctl name="ADC1 Volume" value="19" />
<ctl name="ADC4 Volume" value="19" />
<ctl name="VA_AMIC1_MIXER Switch" value="1" />
<ctl name="VA_AMIC5_MIXER Switch" value="1" />
</path>
@@ -1028,14 +1028,14 @@
<ctl name="ADC4_MIXER Switch" value="1" />
<ctl name="AMIC1_MIXER Switch" value="1" />
<ctl name="AMIC5_MIXER Switch" value="1" />
<ctl name="TX_DEC2 Volume" value="101" />
<ctl name="TX_DEC3 Volume" value="101" />
<ctl name="TX_DEC2 Volume" value="96" />
<ctl name="TX_DEC3 Volume" value="96" />
</path>
<path name="screen-call-dmic-endfire">
<path name="handset-dmic-endfire" />
<ctl name="TX_DEC2 Volume" value="24" />
<ctl name="TX_DEC3 Volume" value="24" />
<ctl name="TX_DEC2 Volume" value="19" />
<ctl name="TX_DEC3 Volume" value="19" />
</path>
<path name="speaker-dmic-endfire">
@@ -1279,14 +1279,14 @@
<ctl name="ADC2_MIXER Switch" value="1"/>
<ctl name="AMIC1_MIXER Switch" value="1"/>
<ctl name="AMIC5_MIXER Switch" value="1"/>
<ctl name="TX_DEC1 Volume" value="92"/>
<ctl name="TX_DEC2 Volume" value="92"/>
<ctl name="TX_DEC3 Volume" value="92"/>
<ctl name="TX_DEC4 Volume" value="92"/>
<ctl name="ADC1 Volume" value="24"/>
<ctl name="TX_DEC1 Volume" value="87"/>
<ctl name="TX_DEC2 Volume" value="87"/>
<ctl name="TX_DEC3 Volume" value="87"/>
<ctl name="TX_DEC4 Volume" value="87"/>
<ctl name="ADC1 Volume" value="19"/>
<ctl name="ADC2 Volume" value="0"/>
<ctl name="ADC3 Volume" value="0"/>
<ctl name="ADC4 Volume" value="24"/>
<ctl name="ADC4 Volume" value="19"/>
</path>
<path name="unprocessed-hdr-mic-landscape">
@@ -1330,14 +1330,14 @@
<ctl name="ADC2_MIXER Switch" value="1"/>
<ctl name="AMIC1_MIXER Switch" value="1"/>
<ctl name="AMIC3_MIXER Switch" value="1"/>
<ctl name="TX_DEC1 Volume" value="92"/>
<ctl name="TX_DEC2 Volume" value="92"/>
<ctl name="TX_DEC3 Volume" value="92"/>
<ctl name="TX_DEC4 Volume" value="92"/>
<ctl name="ADC1 Volume" value="20"/>
<ctl name="ADC2 Volume" value="20"/>
<ctl name="ADC3 Volume" value="20"/>
<ctl name="ADC4 Volume" value="20"/>
<ctl name="TX_DEC1 Volume" value="87"/>
<ctl name="TX_DEC2 Volume" value="87"/>
<ctl name="TX_DEC3 Volume" value="87"/>
<ctl name="TX_DEC4 Volume" value="87"/>
<ctl name="ADC1 Volume" value="15"/>
<ctl name="ADC2 Volume" value="15"/>
<ctl name="ADC3 Volume" value="15"/>
<ctl name="ADC4 Volume" value="15"/>
</path>
<path name="unprocessed-hdr-mic-portrait">
@@ -1410,7 +1410,7 @@
<path name="voice-tty-full-headset-mic">
<path name="amic2" />
<ctl name="ADC2 Volume" value="0" />
<ctl name="TX_DEC0 Volume" value="92" />
<ctl name="TX_DEC0 Volume" value="87" />
</path>
<path name="voice-tty-hco-headset-mic">

View File

@@ -201,24 +201,24 @@
<ctl name="HPHL Volume" value="16" />
<ctl name="HPHR Volume" value="16" />
<ctl name="TX_DEC0 Volume" value="92" />
<ctl name="TX_DEC1 Volume" value="92" />
<ctl name="TX_DEC2 Volume" value="92" />
<ctl name="TX_DEC3 Volume" value="92" />
<ctl name="TX_DEC4 Volume" value="92" />
<ctl name="TX_DEC5 Volume" value="92" />
<ctl name="TX_DEC6 Volume" value="92" />
<ctl name="TX_DEC7 Volume" value="92" />
<ctl name="TX_DEC0 Volume" value="87" />
<ctl name="TX_DEC1 Volume" value="87" />
<ctl name="TX_DEC2 Volume" value="87" />
<ctl name="TX_DEC3 Volume" value="87" />
<ctl name="TX_DEC4 Volume" value="87" />
<ctl name="TX_DEC5 Volume" value="87" />
<ctl name="TX_DEC6 Volume" value="87" />
<ctl name="TX_DEC7 Volume" value="87" />
<ctl name="ADC1 Volume" value="20" />
<ctl name="ADC2 Volume" value="20" />
<ctl name="ADC3 Volume" value="20" />
<ctl name="ADC4 Volume" value="20" />
<ctl name="ADC1 Volume" value="15" />
<ctl name="ADC2 Volume" value="15" />
<ctl name="ADC3 Volume" value="15" />
<ctl name="ADC4 Volume" value="15" />
<ctl name="VA_DEC0 Volume" value="92" />
<ctl name="VA_DEC1 Volume" value="92" />
<ctl name="VA_DEC2 Volume" value="92" />
<ctl name="VA_DEC3 Volume" value="92" />
<ctl name="VA_DEC0 Volume" value="87" />
<ctl name="VA_DEC1 Volume" value="87" />
<ctl name="VA_DEC2 Volume" value="87" />
<ctl name="VA_DEC3 Volume" value="87" />
<!-- Compander controls -->
<ctl name="WSA_COMP1 Switch" value="0" />
@@ -652,7 +652,7 @@
</path>
<path name="headset-mic">
<ctl name="TX_DEC0 Volume" value="100" />
<ctl name="TX_DEC0 Volume" value="95" />
<path name="amic2" />
</path>
@@ -865,7 +865,7 @@
<ctl name="VA SMIC MUX0" value="SWR_MIC4" />
<ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" />
<ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="ADC1 Volume" value="18" />
<ctl name="ADC1 Volume" value="13" />
<ctl name="VA_AMIC1_MIXER Switch" value="1" />
</path>
@@ -883,8 +883,8 @@
<ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" />
<ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="ADC1 Volume" value="24" />
<ctl name="ADC2 Volume" value="24" />
<ctl name="ADC1 Volume" value="13" />
<ctl name="ADC2 Volume" value="13" />
<ctl name="VA_AMIC1_MIXER Switch" value="1" />
<ctl name="VA_AMIC3_MIXER Switch" value="1" />
</path>
@@ -1031,14 +1031,14 @@
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="AMIC1_MIXER Switch" value="1" />
<ctl name="AMIC3_MIXER Switch" value="1" />
<ctl name="TX_DEC2 Volume" value="101" />
<ctl name="TX_DEC3 Volume" value="101" />
<ctl name="TX_DEC2 Volume" value="99" />
<ctl name="TX_DEC3 Volume" value="99" />
</path>
<path name="screen-call-dmic-endfire">
<path name="handset-dmic-endfire" />
<ctl name="TX_DEC2 Volume" value="24" />
<ctl name="TX_DEC3 Volume" value="24" />
<ctl name="TX_DEC2 Volume" value="19" />
<ctl name="TX_DEC3 Volume" value="19" />
</path>
<path name="speaker-dmic-endfire">
@@ -1282,14 +1282,14 @@
<ctl name="ADC2_MIXER Switch" value="1"/>
<ctl name="AMIC1_MIXER Switch" value="1"/>
<ctl name="AMIC5_MIXER Switch" value="1"/>
<ctl name="TX_DEC1 Volume" value="92"/>
<ctl name="TX_DEC2 Volume" value="92"/>
<ctl name="TX_DEC3 Volume" value="92"/>
<ctl name="TX_DEC4 Volume" value="92"/>
<ctl name="ADC1 Volume" value="24"/>
<ctl name="TX_DEC1 Volume" value="87"/>
<ctl name="TX_DEC2 Volume" value="87"/>
<ctl name="TX_DEC3 Volume" value="87"/>
<ctl name="TX_DEC4 Volume" value="87"/>
<ctl name="ADC1 Volume" value="19"/>
<ctl name="ADC2 Volume" value="0"/>
<ctl name="ADC3 Volume" value="0"/>
<ctl name="ADC4 Volume" value="24"/>
<ctl name="ADC4 Volume" value="19"/>
</path>
<path name="unprocessed-hdr-mic-landscape">
@@ -1333,14 +1333,14 @@
<ctl name="ADC2_MIXER Switch" value="1"/>
<ctl name="AMIC1_MIXER Switch" value="1"/>
<ctl name="AMIC3_MIXER Switch" value="1"/>
<ctl name="TX_DEC1 Volume" value="92"/>
<ctl name="TX_DEC2 Volume" value="92"/>
<ctl name="TX_DEC3 Volume" value="92"/>
<ctl name="TX_DEC4 Volume" value="92"/>
<ctl name="ADC1 Volume" value="20"/>
<ctl name="ADC2 Volume" value="20"/>
<ctl name="ADC3 Volume" value="20"/>
<ctl name="ADC4 Volume" value="20"/>
<ctl name="TX_DEC1 Volume" value="87"/>
<ctl name="TX_DEC2 Volume" value="87"/>
<ctl name="TX_DEC3 Volume" value="87"/>
<ctl name="TX_DEC4 Volume" value="87"/>
<ctl name="ADC1 Volume" value="15"/>
<ctl name="ADC2 Volume" value="15"/>
<ctl name="ADC3 Volume" value="15"/>
<ctl name="ADC4 Volume" value="15"/>
</path>
<path name="unprocessed-hdr-mic-portrait">
@@ -1413,7 +1413,7 @@
<path name="voice-tty-full-headset-mic">
<path name="amic2" />
<ctl name="ADC2 Volume" value="0" />
<ctl name="TX_DEC0 Volume" value="92" />
<ctl name="TX_DEC0 Volume" value="87" />
</path>
<path name="voice-tty-hco-headset-mic">