From f21fa1b132b6e571c4291f56a5c594a85122261a Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Thu, 26 Aug 2021 09:13:15 +0800
Subject: [PATCH] audio: update tuning tables (20210826)

Release Notes (R4):
- Retune top volumes for more balanced sound, less harsh
- Heavy emphasis on vocals, both depth and clarity
- DTMF volume curve reduced to better align w/ O6, F2, C2, B9
- SYSTEM volume curve reduced to better align touch sounds
- SYSTEM volume curve copied into AUDIBLE volume curve

Release notes (O6):
- Camera shutter (system sound) decreased volume curve to better align w/ R4/B9 and F2/C2
- Slight adjustment at min vol point for DTMF
- SYSTEM volume curve reduced to mitigate loud camera shutter
- SYSTEM volume curve copied into AUDIBLE volume curve

Bug:190960105
Test: High level tuning validation (b/190960105#comment15)

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: Icf0c9e921017b5e06ec950452a78a9d89acf86f2
---
 audio/oriole/config/audio_policy_volumes.xml |  18 ++++++++------
 audio/raven/config/audio_policy_volumes.xml  |  24 +++++++++++--------
 audio/raven/tuning/waves/waves_preset.mps    | Bin 187271 -> 186955 bytes
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/audio/oriole/config/audio_policy_volumes.xml b/audio/oriole/config/audio_policy_volumes.xml
index db57662..a58e237 100644
--- a/audio/oriole/config/audio_policy_volumes.xml
+++ b/audio/oriole/config/audio_policy_volumes.xml
@@ -52,10 +52,10 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
-        <point>100,0</point>
+        <point>1,-4500</point>
+        <point>33,-3000</point>
+        <point>66,-2000</point>
+        <point>100,-800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -143,8 +143,12 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-4500</point>
+        <point>33,-3000</point>
+        <point>66,-2000</point>
+        <point>100,-800</point>
+    </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -158,7 +162,7 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4200</point>
+        <point>1,-4000</point>
         <point>33,-3000</point>
         <point>66,-1800</point>
         <point>100,-600</point>
diff --git a/audio/raven/config/audio_policy_volumes.xml b/audio/raven/config/audio_policy_volumes.xml
index db57662..cd0e3a4 100644
--- a/audio/raven/config/audio_policy_volumes.xml
+++ b/audio/raven/config/audio_policy_volumes.xml
@@ -52,10 +52,10 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
-        <point>100,0</point>
+        <point>1,-4700</point>
+        <point>33,-3800</point>
+        <point>66,-2800</point>
+        <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -143,8 +143,12 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-4700</point>
+        <point>33,-3800</point>
+        <point>66,-2800</point>
+        <point>100,-1800</point>
+    </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -158,10 +162,10 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4200</point>
-        <point>33,-3000</point>
-        <point>66,-1800</point>
-        <point>100,-600</point>
+        <point>1,-5700</point>
+        <point>33,-4000</point>
+        <point>66,-3000</point>
+        <point>100,-1900</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
diff --git a/audio/raven/tuning/waves/waves_preset.mps b/audio/raven/tuning/waves/waves_preset.mps
index c244cb60411c113768a0d62c86dd5384553dd690..bd08ee30a1ee969ddde614206486e06935e0a2d3 100644
GIT binary patch
delta 4099
zcmeH~T}YE*6vv<QygFaCxwpJXOlp2iqpWOpkzwtf1@@t7UIa^`O=x{k*szOgL7N4w
zjJ{5ET9K(;L<z}U@X`nQ(Uobn1x7{}d1-_pWHCY3)}nP8CFOGei|69NInM*X=YO8_
zoK#Z#@1?5Bs*ROv-&{}y#j+vJ5;9pMs=-9&Ydn)yzk~wL7>zyT226XB33{^B@?Cf<
zzkqI}fEtW6`wKXD_fE_fTq0wv#qA#HLXYrCGjLt5VN7IK-C+gDHV6$+jl;*BprCBN
zjSn_%!}p68V(F$T@;P{VQYbwniJ%zX0z+e8dQvbLTyVF11V<ZlrEqD(&1gw)_VFxE
zMJKol3ca3wS0Wg(`?N!2w#sG*Z5%qd*=n7GRZR^Vheh5Sjzu&d{Y`r5XscWwjztdG
z*F~0gzFgy|mk&mxYHDrg4IrXtpOZ^A#j*y@fEdZR-$m#5^9(#NSSLOk2<w9Z$5v)|
zi#i_x`FuPDU#!}rJT3zS>@S@~i~C>&w2)EFH`BXyP)E{JP>a@Y`fTvpCWi!pnPdf?
z!x7H&?vOJddf*D#D&P`SkTwzAbT|nl>Zk+>i@N8Mtb$}r&}D%ZZMpL<>Lg_{5efxw
zh3?c=2;eLGhFIe`{Lwy*IF15oJNfQkrN^1c+i}_cN9_1S4xVlPiCY?DDd9^Wk&!HR
zUOc_MIO7?D3zzinh&Ai|CoOa;Oeh3$^!VCd9%~3^yz_*K5V&*A>!aY}?eqJ9^P8j0
zKX?KKS6(qL>)jrO7@tA^;tV<!4OG!=fgT5N^82AC$}w)nm@}htXdFtk$vjujnao%%
YImbaqRmq{{#}_e<HTJNYO8C;Yub3~pg8%>k

delta 4482
zcmeH~U1$_n6vyv5lk85kn#7R0wfWf1YN+Bz$V4<!&7ByuLX_R0HU%Zgw)I<^7<_50
zSs$b*f{FLxm;^QUK~w~lRYnk!-Qb&2BH}}<Vg!jwOW9D1T@=PMNdyf|)09G#?twFN
zXNG(4;oRT(bLPh7$=_R(UF89Db@Sa;m#y#n8AZwru}n>YFQ!VFDugcFLUgtrtWynp
z4QeVylYYy_8DOaWk0r*tDOd&hx-n>(QA;ktIiNbPXX&<Wci+7EYni&FJ&QEg?9m{H
zd^woqPS|$-fnWZhr~&>IAw(Y)N%Thc>N>jrwCx8ncc#^vhwD@6<Qd#eQ4g5ZSqr-R
zxoy{M+T@~)kDyV-x0~s;N8~ra5e`{jMD7ToDouo5zY!Eaj~;a`5wgOS*bi22IlKhA
zSdT|2&kLb!5JDQp?K0OSUZuUwu~cdK=HgG9=B<`$z-+X_Kf(qr1%#$kuYqlJK!*%f
z-;qJ{7GYX?xS>LbZ`s4$j$0dDuvm+<%sRMUyHWt^c>l@?PGeIlU5tYK@6vb=RN_VZ
zKT9HdtF8K((1cdk=eQ2WmqqP_ALv*bd^So3r@(xQ1;O|`9*KF3<cN?gaY*Ll?mPF$
zFBduw%wX_p-T;}?v4J^fb4XRqHHR2@$3CQ35j0xgEyV&vv6fDi;Yv3HD+AZ2jY0BM
z1RpWOJ>aqGzeI#c;DZ$ag{omo50p@C0me|2(7+1ppe{eI8RLj_H*(}>i+n2cLh(4M
zA3UyNoEBB{UV3=%OD%YB2>z@=_<#Q^_(z<Zi|LQ2d_}#LkWcArAk7d@mJ6|@LP*Bn
zDS_~w;W9W}E`;Oa4Ud~b#7zp$0gvkRefo9<WsRsHC-W53fn!y%<DO5%Q{JhNci1w#
zLx5KcnC)$|`R*BZo}=mtHq%xYWYB%*;za2WFW`CAJZ~r8-;7f7JjaE!S{Gsz7VO|L
zu*WCyg>4%@I4V-Pb=TK*yNAYuAH>7uB0Qa1W<z#9Yo0meevT(0M>s`wxC0d`v!`Yh
zg8wH{I)bM0sQ_G29sR2&IDzl4h~f!9Q5uYvz@&ycRXtYckkrr#)=)Y+7m_0S?^`MB
z;~>PsaGLJlf~rxpG${p1Dd3jKX{p%W(RRw}dj_Rm?X<s`9^8UJ66NHd!Tb7WVC62x
H`9Hh@(u6gq