From 2571966bbbbc3bedb6adceaf0e8969209df0f644 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Fri, 13 Oct 2023 16:36:43 +0800
Subject: [PATCH] audio: enable playback thermal throttle/ update tables

Bug: 305128022
Test: manual test b/305128022#comment4

Change-Id: I2ebde017efb511f9b899f0df06c6dbd5402fbc8a
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 .../config/audio_platform_configuration.xml   |   3 +-
 audio/akita/config/audio_policy_volumes.xml   |  30 +++++++++++-------
 audio/akita/tuning/waves/waves_config.ini     |  29 ++++++++---------
 audio/akita/tuning/waves/waves_preset.mps     | Bin 128279 -> 130415 bytes
 4 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/audio/akita/config/audio_platform_configuration.xml b/audio/akita/config/audio_platform_configuration.xml
index 8019bfb..bfd20d9 100644
--- a/audio/akita/config/audio_platform_configuration.xml
+++ b/audio/akita/config/audio_platform_configuration.xml
@@ -244,6 +244,7 @@
     <soundcard_name name="google,aoc-snd-card" />
     <features>
         <feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn"/>
+        <feature name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN-SPEAKER,ThermistorType:SKIN,ThrottlingSeverity:MODERATE"/>
     </features>
 
     <cfg_attr>
@@ -299,7 +300,7 @@
 
     <external_module>
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
-        <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
+        <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
         <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
         <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
         <module libname="audio_sounddose_aoc.so"/>
diff --git a/audio/akita/config/audio_policy_volumes.xml b/audio/akita/config/audio_policy_volumes.xml
index 56bec7b..8031e02 100644
--- a/audio/akita/config/audio_policy_volumes.xml
+++ b/audio/akita/config/audio_policy_volumes.xml
@@ -81,18 +81,24 @@ volume index from 0 to 100.
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>1,-6400</point>
-        <point>28,-4010</point>
-        <point>52,-2700</point>
-        <point>56,-2380</point>
-        <point>60,-2210</point>
-        <point>64,-1950</point>
-        <point>68,-1800</point>
-        <point>72,-1550</point>
-        <point>76,-1300</point>
-        <point>80,-1150</point>
-        <point>88,-850</point>
-        <point>92,-650</point>
-        <point>96,-400</point>
+        <point>28,-4100</point>
+        <point>32,-3850</point>
+        <point>36,-3590</point>
+        <point>40,-3310</point>
+        <point>44,-3080</point>
+        <point>48,-2920</point>
+        <point>52,-2730</point>
+        <point>56,-2490</point>
+        <point>60,-2320</point>
+        <point>64,-2120</point>
+        <point>68,-1920</point>
+        <point>72,-1700</point>
+        <point>76,-1510</point>
+        <point>80,-1220</point>
+        <point>84,-940</point>
+        <point>88,-780</point>
+        <point>92,-600</point>
+        <point>96,-340</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
diff --git a/audio/akita/tuning/waves/waves_config.ini b/audio/akita/tuning/waves/waves_config.ini
index 36e092a..05c18e3 100644
--- a/audio/akita/tuning/waves/waves_config.ini
+++ b/audio/akita/tuning/waves/waves_config.ini
@@ -5,7 +5,7 @@
 # Putting any value other than 1 would be equivalent to not supported.
 ########################################################################################################
 [HAL_SUPPORTED_FEATURES]
-CUSTOM_ACTION_258=1
+CUSTOM_ACTION_260=1
 
 ########################################################################################################
 # This defined the options of supported sample rates.
@@ -26,13 +26,10 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
 # This should be configured by Waves only unless platform vendor is familiar with MPS structure.
 ########################################################################################################
 [HAL_SUPPORTED_PRESETS]
-SPEAKER_MUSIC_THROTTLE= OM:1,SM:2,OST:OST_SPEAKER
-SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
-SPEAKER_SAFE_CALL_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
+SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
+SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER
 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
 SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
-SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
-HEADSET_MUSIC = OM:2,SM:2
 
 ########################################################################################################
 # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@@ -40,9 +37,7 @@ HEADSET_MUSIC = OM:2,SM:2
 # This can be configured by Waves or platform vendor.
 ########################################################################################################
 [HAL_SUPPORTED_CONTROLS]
-SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_SAFE_CALL_THROTTLE
-A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
-USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
+SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE
 
 [COEFS_CONVERTER_SETTING]
 AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
@@ -55,10 +50,12 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
 #AudioFormatSampleSize=4
 #AudioFormatIncrement=8
 
-[CUSTOM_ACTION_258]
-CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC
-CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL
-CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC
-CASE_4=PRIORITY:3,NUMBERS:2:0|1:4,PRESET:SPEAKER_MUSIC_THROTTLE
-CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:4,PRESET:SPEAKER_SAFE_CALL_THROTTLE
-CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:4,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+[CUSTOM_ACTION_260]
+CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2,PRESET:SPEAKER_MUSIC
+CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_MUSIC
+CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2,PRESET:SPEAKER_SAFE_MUSIC
+CASE_4=PRIORITY:3,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC_THROTTLE
+CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+# Action 260 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t
+# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
diff --git a/audio/akita/tuning/waves/waves_preset.mps b/audio/akita/tuning/waves/waves_preset.mps
index 8a11c08e812ea1e60ea18201a2fe69a9ffbaea87..569a87f2d0b34f8b6935c2283b33432977c6c6d9 100644
GIT binary patch
delta 8510
zcmeHM4Qv$06`t9nHW=IIfPc;g|6q(c;~36&n1n!ld%274iVFsWoNH?N2jes49NCsb
zNleoo5@*~<6+chO#-xqxrfNhIETqLrD^YIkG&HG=>Qt&qQW`*&Xj4#QN~5Y3G<~zP
zKaPC?PN6AjJz{+GX6C(_c{BUHnGfmDi68wlG2x+2o=4hl97_20;!Hw_CEc^Z)mXKw
zy}hx{+30jQUFDAQ@~5sJy7E1Ex^+1W&<SDE4UVCJbpK;CLq0EbQK8^zNIRZwwTZQa
z%ta$CVW)5J$b#DA9!adH9&p#ZDK(tL!lIq2@W*18bm1fwOT*`WF7}v8$;uuky!o-c
z{=n!}_qWWJNw-wqKm+jm<sRvm4KxFGg{t5wdkVZAYJm^!%M<yie}cUmekTmH!sLms
zN&je~sq|5J@$qb$2N(R=Y~qJj6r~+JEWXVwU)lVVyvXINZWtN%mpH^<8Ka49;sg^S
zmsyV#@m-^ZELENxp*Hzo(!-Rlh4(u~?d!$sMsriMc*77#p7<|QSSc&XH3D4;DcyU)
z@5q6PEhTWkab3D^2Q7dLPi%WB#VO=Id03RF;lniLc_z5jWD%ipcM)t{y*H0}?Z;*}
zqP)xm-D^<z<h_tx(UC$<n0?wMPdi<hQFE~;eW;p>Z<sBUZuw^w;})S{n{;J}7Ryb0
za_2~^WSRrfhS%kDx$j!&J214QRf-1aTsh(kCETXZ$({1KP4zh(Ogc(!P}%W<>iA-6
z2ip0<?YiF%O7bYGdwx19$*s7!#?+(eciarw?{HIN7ZQVNx&&QY_X<RjCFeJ(u`5UV
zS;~mHE1uk(*Tg~7tp&;tnZVE3$8NZYdpEJ#W8JKXubRD<KtaV0`;?6mTg73snJBL_
zLEW^A_lWZGiuYn{lpJjsw$R1!qGvSSrgY6m4Lwm}nIpi4mYQTjL^q)aBKYqy_$1<7
zKoso6vtFI-eIN;|ba9inWD%+N5z^y3Gd_NbWkSMHqdl~J6PhI>M#ZG}{#-oqMg^)8
zig_{#|6m%1X0NTtFzJt;8TUuA-Wc+oB~&13gtSP1d7g@3J!YQ;9rVu~108u{i_JXi
z|5d~ppwdU<bUyr`CmlrF{+aNDr}~*W=_dp~I$-J{dW67WudT4qN5yLOY`R=>lx6Iv
zrS7w&`)n;9`;vRZtj|Ut3G;LOqs|B2dPa12^RJ@&EXDp?VW1@+LM`)3l|mm8?Wo9=
zbhFy8f(IH;ELVbLZ)Jj3#P6ldINVde7v4U7ArghIh^?^1N5eJhLhwVtMJU>0!sZyE
z?REMXlio^OY;(h^xuOzWEB6bU!u7GNC+?S(%jA^SHp;_zK0F&-tA=toFO-&sH@_vW
zHiOmzrGg1bzkR9m!KA;t*O)CBHJYpHDLlJFjqhKD{BNukPJ(pkeT*_g)eNz&xm%|8
z2eCMy-T<uEkBObEWe(16e0%|{*y&`q0nZBOQR6Z&(BJ=IRJ{yrVL^Ixsu<%kkRRfg
z0eM#_N@qrWIPcH76EVL?kNJNU<le4HLG@D8RFrOJg6^elW(#_0@QFb)tj{9^7dG$H
z0Yq-xoi|sFxayG?YzeS*UsYmVnAU|S&OztC{8Dx^V~K`OcuDv)=CfWxE_*4t;U!9<
zk0@z)Vl(k~5xlZ5r&8I9U&q%`Y{Kdw9<H700Xx$FUX<lv@Dd(0qPScOm0&PIA*4Vp
zbGaBk*q2*&q(2+`gt0&W<;c$`wUtc;vySV{P~T!(uPntue0*RG8Q88TQ7;f&5?j@D
z1D#V1n4evfLI}%Y<;-|H&h$C_Bw`!rVFpTP&H$AO<^s$Lk2abCXpB@Pa9i+dWTRgE
zB=W#~#Tdm8Dc*eeP9z<6_b$-89Oz|=1Xlr@ybhSZKUHtZ-(Q!-P0sk#VW2m=ko$*)
zQ`MO)l;X571{wpxp8X{*QiSae)t9;}T&`~1Af8!&R%UL|-2tKPm5|YA(`Vx9+o+wN
z^>7uJ@N!?Kjn9m2%havAG!O3SwJr8xy}D&=N|+IdG)JvjCco9!F^d+r{X+P{(L(ye
zDq5Xznp#iS++}ECRVOw5V~+zZVjGA9En*vp11-1#DZiXne??u56e_2+yolFmjuyO=
zffmwzPP$O*UF&3u1owuag*4`*R;}f{lRlcMnv5SU_<-@Fg{FsSA^pZhv$dIAbJ1FU
zepIxO+E&x7EOlnF(IPJvT5!{LLIvsS-)J!$d+izR?*3gU3s!5SL7Lbht}<^0a~1d?
zXu~#Xu!m;J*0zUd$pphY|D$BW7_^^h)5(M^EwBV`bufCVTzlMQnWY}s<#HM!^yQ!)
z0zn!Gmd~Ibv}&Dt(8SNA9<+9odeACN>Va2GN3NSt4_pDM2TM%qVHUpr<6P+f2`v#A
zBZ0BQw@*t1#whlWla}C0DlMTEKa-Z=?K5s4x27dD!;F^Dij0<sZI06t#W$lRxL;N-
zqZZlPnnx2CA}ix^T?2<8P9Z6779lcciHlhOS@DHGMO5Nq-3VPbBHT4k5hU&LG0P|Q
zIi4c14aD&jiESW`rwBKo5*J#L5f@rfe~NI?c#5dRh1P`;7wbj{?u|iQXf2Gm&=jZ9
z1JW&t3(Z8_#D%7(6BnAuhznjci3=`I59pk@i1`%Z3Tqgi{GzXT7EiLj+(hW9GJ2})
zp}P!E_@q7up2Ri~2cE<>5C@)c11g?qMTRF@QO6T5ei~1-E(}jjl@Z(<15dOTh9{b0
p+<2myh#OBdJsnRpk>Lq1ns~zHIPiokAhlspsf{-t571Y>|8MpIj%@${

delta 4382
zcmeHJZ%kWN6u<YuS|}8dHNsdJH6TJ}1gR#lF#8I~m?^R^om(VnQ$uI8j3(+5jf92-
zaFC@LhorjU&?qsPz>v3~e2_gClPwEHAQJy1N~a$djg#?D6E+j??Y*}J>^?x6g#=%?
zx#!&T=e_&u?{Lois@DIzR#S1rQk%MRRx@KrK?ubq7nc^7*sI@gyX{tM;quw#Gq8W=
zZ~u|6upV9=sa1M%SK~1POScn>5*~va-M>iaB`}U1PxaQwDnbb)33+52{Cv{ncih7H
zX{8<Vb!zylpx$?NMUr7*%vz8qe-n209+#)6^0DWj?z@i+@^sjOO2D%Js?zK^EGeEZ
z+c8*QZ-w$;78uVJLQC*o_o>!TF2rLg+v}74n4~a;9<BN=Ra~KG(F~s5{r=z#PK4l7
zWiWmr0qlk*|DTs}k|Ourz)J0{$0cR>!)N2AJ7!RCPx>c+#4jr;X1@fga|XA;=pzka
z{;XiTA)%B9%{cZDDC+G%9J%?dq+)oxq9(cK<^eOpb-$874@^}Q!of=2Ln`@|$x_v@
z<=)}}oq8p#%1hKyYY0qCjMIgXH)6Cm9M$lI!KKo)z{Ef}&#Vzk;9hRrZfJAfO+usk
zTns?}4Z{=HI|S|SgSo9A+xowVhB>zg%()sJb8e)VbCF=4!Z2qCqq$10>jV~MZUFt6
zGE(Z-Fz9_2=zY`zKC<u2pT@~>Cw~R(ZVRM*|Dtl&{U*MD{qMnPP~5X8cK-#+c2V$0
zPPIk~{@i=?N&HX2=P7sJU)7R=jv)I%Je<E+tv%L^k2QbY1H)}Od-a6G^ugZCl?Yv{
zMBX3B{zoN}GhnqXD+|3<MQE$C<sds<GF{O5X?7wanP{?l2)5@y-;lmYEviCZ3kj+x
ziv}BsGhH;up#~=0p<M*Rm4Rvv%RwsbNhlx87V1<*$!=0Gv}ouT@HbiEpT!)Q8!$lM
zJL$r8evl?X<U@cFKnEv>l7zKo=%^6qPZyfJc~xk`SGrv7DqSYiYh-tY_O&ksd&4tu
zx-(OxnY;8nN3k4kF6F@9u7?xYCB}1==B}ol!J`EyUT{7gBObA2Ti_834DpDIf=684
z$Rl>Vo=4o3@@T<{$gS4#h+8R-gyUv;#Nz~yxJr4%#4wL^OfNuK^7lD#KKwM?xlJ3v
zgBw6Ppm+Mj{{zT~4UgEyqBTQq5zUaR(VHPR(q_oTNHb&yvqpGjxoMlS?tzXUJ{9}a
zq-cn9i$I*K(GllHiZ~Y|BOf~$&Bbv_ovUFdG>$`>Oq`k-h*9524JF$`-(Z2HZyeec
zO2NmEeO%kvHJJPQuEA5x50Vs!Txm_yNakr;hF;*(rbiE+U9=3Y&Rwcw_(eJfvy4*;
zwRAP^1PWDa(=%{-Mp2A7#FA}+Lo6^fdvH<A9$ekXB6hr<MckFn9_bl~+-ePtlE@Lg
gDA3tMIBs_K;BkUTT&1%I6T?j6Z}|MY1Ap85FD&&HssI20