From 934d7c4e5c038da650dcf1ad6b2abab1c28553a3 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Thu, 23 Feb 2023 10:24:25 +0800
Subject: [PATCH] audio: update waves, media speaker volume curve

Merge notes:
* Update max volume for loudness, bass, stereo, dynamics,
  distortion improvements.
* Update entire volume curve for competitve listening
  experience.
* Update entire volume curve within 1dBSPL of previous vol curve
  (to be matched within 0.5dB on next iteration).
* Moved all volume curve gains from output trim to XML
* Tuned to pass power for Pink 13dB CF noise on speaker loads
  for battery and thermals (40C - 41C skin temp).

Tuning gaps:
* No thermal throttle merged (2nd LL) yet (next iteration pre
  dogfood), so TMO use case unknown still.
* No BAACL tuning merged yet (next iteration pre dogfood)
* Non-media sounds / vol curve not yet tuned

Testing gaps:
* No monsoon testing (to be setup for next iteration)
* No official thermal testing (to be setup for next iteration).

Bug: 270274623
Test: manual test

Change-Id: I26ece68c56c98593c68cf5d7bda979a2a9af5565
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 audio/husky/config/audio_policy_volumes.xml |  28 +++++++++++++++++---
 audio/husky/tuning/waves/waves_preset.mps   | Bin 136974 -> 138030 bytes
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/audio/husky/config/audio_policy_volumes.xml b/audio/husky/config/audio_policy_volumes.xml
index 5822888..a18d26a 100644
--- a/audio/husky/config/audio_policy_volumes.xml
+++ b/audio/husky/config/audio_policy_volumes.xml
@@ -76,9 +76,31 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-6000</point>
-        <point>20,-4790</point>
-        <point>60,-2140</point>
+        <point>1,-6253</point>
+        <point>4,-6253</point>
+        <point>8,-5936</point>
+        <point>12,-5567</point>
+        <point>16,-5255</point>
+        <point>20,-4916</point>
+        <point>24,-4577</point>
+        <point>28,-4227</point>
+        <point>32,-4017</point>
+        <point>36,-3800</point>
+        <point>40,-3580</point>
+        <point>44,-3364</point>
+        <point>48,-3100</point>
+        <point>52,-2871</point>
+        <point>56,-2639</point>
+        <point>60,-2405</point>
+        <point>64,-2167</point>
+        <point>68,-1941</point>
+        <point>72,-1707</point>
+        <point>76,-1438</point>
+        <point>80,-1235</point>
+        <point>84,-1075</point>
+        <point>88,-931</point>
+        <point>92,-741</point>
+        <point>96,-524</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
diff --git a/audio/husky/tuning/waves/waves_preset.mps b/audio/husky/tuning/waves/waves_preset.mps
index a194106fc8a5da49b28ecfde5697d16c63ff218c..283bef873499f0de13d946acfe2fca1b43586f24 100644
GIT binary patch
delta 9559
zcmeI0e@s<n7{}k|@aytJFDsPmZ?X$&TLxo*7k}IXBKQXh5~)q5w90U)fZCc?6Gv-Q
zGr%`JYCpg~%6=>^?pEm5=E45yk5Y<eV@`x=M$N6uTBVzR^gic#&OMIx2ZOsg?4I%N
zexK)k@Ao|Kd*H)+-nYA4U0=E4iz|yB&zf^OJ`ob<%+^Hg17c5>^gz}0G&5ERmq->u
zoK5l@W;tX*z6`xnod81UKNWf8=%QJ$&}fT=Lb+n-Q7v>Xc;QG_9C+pFs<MP{{#snq
zdj1#LxHMC1Dv&2#Sw_mcFwK}-4Jn$wQTE-~qlu@Cj%vu#gphsjt(t4r=)HK$wZr?<
zy2?O5j{#ke84o=Peyw&}5cZX6TIemg{`V%WDc^Y7t<nwq4EL*+Pq3r2T2p?;p#$KN
zU%NkXZ`U_N*hc6^U^DDaZ8)Vr=VU{EBc}#-yU!fa>z(Y7T;KF^!uQ|dl`0!+{$7%;
zA9A`=&9^Z)aU8D!f2-4@?4TLaj}}5+e#n2+>DZzhPT)0<VerH91KU36yx~9Y^o0Df
z-8Z7en#Q@U;L(&_@2@b^_+u*+%n@IN$F;nse;E$MY||*JwMO@hE{E5lXYgZq3FJJ_
zMa|sMGdc@a$0{dz^36>#dZlhOTu{sN{_20w{oqAN*E+Y$w(g8HYqdxA>bc3`HA|7h
zmvpz+^f@W7F0+5mbT2bkI=N-0vAz##XXN4)T%(sdT_JxkRQCqN%#E)xru_*EWcQV6
z+2%7P!rWCNn)a3mv0t@LlbWtRg=$Ub)Ta>O9#KE@YK-<Y4ZoQvtJ)rvC(4p$iemNq
zp<1X&h_qthfwFs`C|S&3ZGTZ-4Q@zxj|k;aj&`brlF(R)RM|V=dDt$*Dk4>RVXIWF
zw#fE4QUps4a}l`WsTkRLc~=6-S7e5FK{^{M&nMK3HkAl{dkL63jMF<{Mz#<c$_*R3
z9#c){&mmn+8DsU?9lo0!ZqK)G6!31b<-x<@Y(=J?a^m<bzg?efyHb^u-5U-s_N?+y
zdDW^UP|cq5QII*_^p*M&RbrkhRW)ngAzVk*zP+o_qScIXFhGt5({q~^mH@h#Im&4{
zyJYmLd8#&KsyV4<U*sgS2iNgrjGPz<&&C|IWiVmUhZ*q=x1r(oXX-hYx=5A_+4#bI
z**B18tdii8g=>>|ka{rr2{h<gdGhiCBlIIA%D~z@yMGwg*?zdHG}LGWD7DkLtbE6c
z%u+V1mhD#-NWa%*?9?F3?pModOPmUuSyN#LHI*ci*Sw$^pT~gj{@`f7(U%X~{+}?d
z)y5)J(<^)0=0hq>0erUlpw(A64t&x;2cH}xK3jc4c}xJG<l*3xJrSQIBZ^OUA8s#*
zvnDN(o}4^**iJg|<SrYY93nhPP6nQ|WRZX;Ia%<evIw4BEfR<1btKO8#ZVX}4*uVn
z%G<Z8O`M8msA&Fe9K@l44skd};#4#X<uL)`kcUGY_C(^4j3{x~9k&)N1KzE1*8C-I
zEI8>PhZ8n(I7H--oD6bk%_4yua<Y&^Wf5|?T0{=Xn~0o-awv`>CyJbV`Hpz21#Yz@
zj{`Y0&_NEzh@4w3LU~L8IppCWhdmKFBqNF(c1Pr}#9a<cWDZM*Ih?SW!yz(<<Ybsb
zixvsykdwt6DvOxI)#5uM%d2M|(O%4w$!DwY59&mZsHXf8RiF+6bp_+V4-G{8Bw0sP
zRxAgD8`A@ILRn0JK4fXrCo#?{#X6v(o`}MS>qq#oMEI~o_^@=~!wChSL_DCfLV2Ob
z@1c&#u!oi`66_%-i#=2pv4?9%_K*zT89bE{AGia7JN@b*mbys(*ZCCnsK=6@Kyu9a
z6!+u#6iMsUk0hN>aoSo{x+9)XQFhGv6c5GoDVBIXMUtmN4r(gwaLxEM23Fi31dSd}
z-F?14l@6!s^PoQOz&OB31D$;v$GC5+&lAdH0^}qQo1CtA_QZV~$%vwp-4UHE5uGgY
zkDR50PEOeSHV$#$MshOjq(zGaJITpnCzVCO;c5{$B(EFEi(zFHIMElyd-<a1%LQMq
zXB@zxfevsuM&S5zh4PpHaLB^}4tpYSNJbPm?2f=;iNIlrz+veChZ8n%I7Hx(oD6Vi
z(INpHa<YI!Wf5?=S_BTso5s#^SQ7<K6gc-1I34}a(f|B7fI|Zv;Bbt<>F5{AV*<b-
z4+l8xiNGNlQQ)vU0*566hb01sr2`yJ*udcsfkSdKz@bHp1aQd70uGf$z~O4~?T}>8
Jr3P5`(Z2|1U>*Pf

delta 4787
zcmds(K};NF6vw|eEVH{UhAd!9W8-2{7Syyxw}99RyRfAVVar;H(F-NfZ0MnNiQY_*
zi-)G9luYBa4TpwAJyB{VX%k7xny3j0gyPXyr8kY*Z7(L48vN$H|Bl0W@IpB3CX@NU
z|9juC@6C^IzZ<tA7jHz&o?JR>?)}n?Qgq{KLxt*8so83zQ`YbI&xfCEZgwY=`|O7=
z(mv~A>ye0|R4SQ#uIQ|_zDKuj9;C65HTO${)g3wPJUG;9IM=`Vj+`G~8LhGxJL!4n
zZ2Lzs<4U#th^WsToTS0YGxnWkO7EWN=~X&n<6%F&6&ajVI$1;Z1%sX)*{|@K__kL~
zeBZ0oy1xIRugASA70M{JTVHh<RczE(TwjTdnmDMh!x@!2lA%<O_Kxc~tLxs>_qVk_
zti5;j{Y=I#^i#vf*RDptmh0DIK7Xs2Oj<?Vpw?z_WqEROWqEng)%kov`%T4bS39*o
zp!JBZ{ebWJd>`^k$3?wnaxs}q>ifVQ75t#%quM8>tSi$k){_&F@?ah$=v-K4GGwjY
zi(5Y@8tu6%+EXt0sfF61Kh4r`*?uGB+4l7;rD{I;ZLO<3UF-ekQ@hrSUYNezT`glD
ztEQ9XM_d~G_Yq`z+PTp3S(6!Cpx8pp_ugQfH}p#tZB0)f;#QD~Rnc%*bf6U!xUHaI
zz@{w4?P8W1?9LF?mH!^Mg>tv8r=+d&Qwz;;>!n1*dfcBVe~I+vuJU4T4vV=tXt%jt
zqE8<n!%myjxgDraIqU6d)1FGv56-#2=0eWjH$&vaH}4uA{)KTWjE8+=gu(b1#+6Q1
zI{wn}R{W#YG8d*_3IfPrPE5aOrXMzA0_~$;9FKm4E+MF8LZF!tXqS+%=n-rG*y}q)
z$5f7{a>smhz+gJ2a!MyFoet@ED;*INb6`9~2k<}v;~|>yfX#S7`|uFQ!vmp<2WlA)
zXvPDYHxSXI?gmnmqn;f?WMhUlW;%R`z+gl+W|U4=IwI0>5E0CQ5fL3g1O<$UXhsA!
zBLeM1L>vzhgf1eeWkjGE5oi|?)L5mjUN9atThA;EZ3iTQ16A7+wJp8u0|EvE(YB;?
zveJQ&j)Op84h)3o01zl(AVf0|uo(zw9}wbrKp=F1KrI6S%|Jji5Tcz+_rGW|OC>6m
z?)hFE3_ekb_D)nt@rg=wpcfRly@W;o=R}1P?hD%O3nwaZhAjVyN<7PL4hy(BXl@Rg
ze=kL!w!2I^x*eeZ?{VsQ^(@WLp5+nR;|7_C8U6WLrE`^z{ya}0h`zWsqc3_3E_*R2
zCSUSQK9*@hI#A&PVy}cKEU|~ZR5BS@q{$e>A_fDt2BRa&-*MysRax<|*LH-AK6AC6
zR_ovK{dd7&HdgDEPF6Y_(s7Ut%z@buy@icE<;gJ|QowLv9d94dzHLz)j}L_I&VgFq
zIiML3Xx=$QkJ`~39or#3YQt0;-t_SSgZZcpE1j%#KBVIyAD9F4Av(YZ3YZVk%m-}d
g1KP)jI36DeT|Q9Dd_XfF(EPJ0`u3k6(yO2U1Cb<ci~s-t