From 0dd39b7952112afdf057d9f59e3849db410e8b2b Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Fri, 28 Oct 2022 15:27:07 +0800
Subject: [PATCH] audio: waves: Playback thermal throttle

- introduce 2nd LL in presets.

Bug: 256506814
Test: manual test

Change-Id: Id5d2635ac45c51ad5d65ac517830fb692831ca2b
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 .../config/audio_platform_configuration.xml   |   3 ++-
 audio/lynx/tuning/waves/waves_config.ini      |   8 ++++----
 audio/lynx/tuning/waves/waves_preset.mps      | Bin 130918 -> 131267 bytes
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/audio/lynx/config/audio_platform_configuration.xml b/audio/lynx/config/audio_platform_configuration.xml
index 4e19f23..a6dbf17 100644
--- a/audio/lynx/config/audio_platform_configuration.xml
+++ b/audio/lynx/config/audio_platform_configuration.xml
@@ -235,6 +235,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,ThermistorType:SKIN,ThrottlingSeverity:MODERATE"/>
     </features>
 
     <cfg_attr>
@@ -288,7 +289,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"/>
         <module libname="audio_cca_aoc.so"/>
         <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y SHARED_MODULE=1130578253"/>
         <module libname="liboffloadeffect.so"/>
diff --git a/audio/lynx/tuning/waves/waves_config.ini b/audio/lynx/tuning/waves/waves_config.ini
index 7c520b9..05c18e3 100644
--- a/audio/lynx/tuning/waves/waves_config.ini
+++ b/audio/lynx/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.
@@ -50,12 +50,12 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
 #AudioFormatSampleSize=4
 #AudioFormatIncrement=8
 
-[CUSTOM_ACTION_258]
+[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 258 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t
-# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
\ No newline at end of file
+# 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/lynx/tuning/waves/waves_preset.mps b/audio/lynx/tuning/waves/waves_preset.mps
index d121befe06989d8c00b23140ac5392da545882af..8f594d0900ab27a44a6fae8f85ed4947f90a1d28 100644
GIT binary patch
delta 2472
zcmchXUufG^6vyvrwxq4qb=BEcx@FZ(H(1vs%m+7#X>0YttZG&!46|PyD{Qcqp+!*K
z7N3-<6ZwJnrQjZAY)k7;DAO?uV+<@VT|s=Y(0~*~v42*X4@JG_p6^Z4Jc#UJflEI3
z`#b0NJO4QIe@CvrUmNLurECAUs^+uE?R`%vr9#`&@tD_pus^;#=5=><^`yPT@KG<F
z_WB3k8u1dbL?RxKC9eKMYF(3hXDihhCw0o-Krhv_O$O8L*@yJd4%!)<EdI4F=zIEF
zZNpN%s%0akaxVt?TeG3M#clQ0?X-WY{Z(;$wr#Cl>dOa0er)+iI-v`j=(+In2rZA?
z_2b=1ho9bYs7D{A7n~ejDapH<sSmQwHIvi*Vvm#km;X#g<kkIt@oZGT*Fw9U%UDa<
zWn-`VfKIiRKX!RMp|7=4!x?$U36mq4V=}h?A;X+{`uOnR8*d7ms~Wv=p@-B@=KO3<
z(VTg6e(O={-RJqa{Bqx!|4F4%=A1WY4rh5pnNp;lFr{x)>TnGy@*lYyt1SQL!E|hI
zSmzJW_Mq_VYwQ2JwuKog%-poK1#)c#rM8f{wvcUY!M3(A;o1VZwt^M4g^R5%?6|g&
zZEYc!YAg5qQ`^FfGNrh&&D3@)*H$UzUq2Q%wVh~ujE-;g2YzV?9{gfYU3Eq0LZQX=
zX?=SWMg8+1)aqQ8wnSDkw35lB{q!9x`l%0{_O)Kh8p|gyoePT**Ljcs$E7BBpFB)S
zyx?`+(QJ&*jn(N6k2;*ifM@1Yyv;~=Xm202yL&QUdNg;|q0SAM(S^s!j}AH<9xLJZ
zV|`BDGVc8R$&X8Jm&cQ5<PHC~A$@~a%y8f9u&-p4Dd7*?kd$jk_LFDsu_3doG`o6X
zZ9_z>Xov{qhTv`+B3#`NSlEULmm7jRHw4HHfro7fWNrwM8v^8p0J$MRZU~SYB6xoq
zGP|lw33n(mdq=jM(pQeq=AiAXon7Ik3^ipo+f@SORU#;>1TwD@$aa;0?J9u@uM!}y
z62Xd90vEeVV8^QjvRx&R-72Y<`_0EG6fE^#d^k8Zf0f*pe7i23KScRMMH@YkqZgFu
zA#?PQZS-IpJxn-yAV)7)5j|XN^swXTA=~I7yXf(3V!D+Yqmj-b)j9Ng^~UKOB33Im
zPFOU(n5EN>OUnk&>}(5H&o(UVYzvoX8+V><AkQ{D>}*5k*#`1#19`TAJljB?ZJ?QL
z;Kbe}wL~KeQ)*$#uTFYlidbEfv}lqvxRf;RHfiDNq+wx`7A_}^J0}g~q~T$chRjI=
YIcXp#4dkSOoHUS=7M!?vguWU57rW++DgXcg

delta 1848
zcmaizO-NK>6o&6n8GllntVJO)TCO5vMl2|BbTqAnI{hJm<(<hi6H7v(Bs1Hn;Sb8U
zxPd`!+9icI7>Jahg|rCAMY|%}w1^f8DIuiYbH4Z9Q3=`%&pqdS_n!Bi_j~^^>-&0U
zX7!m!L(2wDW-eAAGz=rXxIPp#Ynv{Fjs(r>NTjCTJlEFM7Vl{@%YtQPp<pP~x=uz$
zfzee&Y0d$o&-o>zpy77U^;Y$?xXNCz2X@=$(YY);FZnq=`%X!Y%-vVx#b=$SnQw=K
zU-ML6a)&*>v?s&YyGFfh(`vFU?BdT~E?SEwm8*vK0=Lz-;<nVgl}5Mvr`@YYu6flL
zt6p_!)vK0vc-31Sb?zHxQ&{vnyi@Nqf54IGH;l__psw6meK=n|xO>Bn`A_%~$vm3M
z_Dv1Z)X)#v9mu<DOzn;q?+)bMfxJ7AcL(zBK;9k5y90T5Any)zcF)oHxP;OYp+b7T
zO9d|G+Bff&XT$Q1G^^-1eWIk*(L$$u70pIP^I<hHT<0J;Xpu>EnVMf)jV1-u=||&k
z)A>WZ!Tm7`yY+aCnp~dURHryKqOM{iVZ8UGT3!vPff2v;Ax`=3xi4|=!<SUBHlSXO
z=Bn7}A@}^msP~C)S5mL78gsW$vmM8*m#yS?Pb9~}Ia<jx_G7A&rvK;1LXELdvn+lr
z)R2SP56zqWKvVnxiyvU|11x@k#ShKmhsJGwU{?Ilywwk!XFo71exS^L06jnO?D&C}
z9ktI#d~=;N*SSyf3*`K2Oyw6X&M%Pj3*`I)Iln;8FOc&K<op6Tzd+6}knf&G=kBHd
z^X~O$*wOj7gbTQ0(TWum0YDa@F(m*k764=cKo$UG0YDZ2WC1`H0Av9`765bv028H!
z<PZ3|XN>NdT!~Zn3^^!qa>~LDCiS~4NkUzc1ePR$B}rgOl4ePg#%)Q$tRzYE)+FIP
zCkdmHB$PQxKrcyn<|JuMSe3Ll;EN6#(ZP=*G&)EQYN22e3KpSY5egQeU=a!yp_)ag
k#%)3|D?&AI6^ipL6r&;(WfltbgyNZnYD{Ebr8iIh0s-*W{Qv*}