From 9f422bce5f273ad40905dd463bdcc36e8454d848 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Thu, 13 Oct 2022 13:58:54 +0800
Subject: [PATCH] audio: waves: support speaker spatial in audio hal

- Disable control in audio hal first.
- introduce new output mode:
 - OM:1  - Folded
 - OM:9  - Unfolded
 - OM:60 - Clamshell
 - OM:11  - Unfolded reserve
 - OM:12 - Clamshell reserve
- preset: F10_xps1109.mps

Bug: 246747873
Test: build pass

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: I8baca667cc4b564984aa0c169db4a0d45412cc3d
---
 audio/felix/tuning/waves/waves_config.ini |  49 ++++++++++++----------
 audio/felix/tuning/waves/waves_preset.mps | Bin 305252 -> 303537 bytes
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/audio/felix/tuning/waves/waves_config.ini b/audio/felix/tuning/waves/waves_config.ini
index ff1266c..24650d0 100644
--- a/audio/felix/tuning/waves/waves_config.ini
+++ b/audio/felix/tuning/waves/waves_config.ini
@@ -27,15 +27,18 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
 ########################################################################################################
 [HAL_SUPPORTED_PRESETS]
 SPEAKER_MUSIC_FOLDED_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
-SPEAKER_MUSIC_UNFOLDED_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
-SPEAKER_MUSIC_CLAMSHELL_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
-SPEAKER_MUSIC_RESERVED_THROTTLE = OM:1,SM:3,OST:OST_SPEAKER
+SPEAKER_MUSIC_UNFOLDED_THROTTLE= OM:9,SM:3,OST:OST_SPEAKER
+SPEAKER_MUSIC_CLAMSHELL_THROTTLE= OM:60,SM:3,OST:OST_SPEAKER
 SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER
 SPEAKER_MUSIC_FOLDED = OM:1,SM:2,OST:OST_SPEAKER
-SPEAKER_MUSIC_UNFOLDED = OM:1,SM:2,OST:OST_SPEAKER
-SPEAKER_MUSIC_CLAMSHELL = OM:1,SM:2,OST:OST_SPEAKER
-SPEAKER_MUSIC_RESERVED = OM:1,SM:2,OST:OST_SPEAKER
+SPEAKER_MUSIC_UNFOLDED = OM:9,SM:2,OST:OST_SPEAKER
+SPEAKER_MUSIC_CLAMSHELL = OM:60,SM:2,OST:OST_SPEAKER
 SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
+SPEAKER_MUSIC_RESERVED_UNFOLDED = OM:11,SM:2,OST:OST_SPEAKER
+SPEAKER_MUSIC_RESERVED_CLAMSHELL = OM:12,SM:2,OST:OST_SPEAKER
+SPEAKER_MUSIC_RESERVED_UNFOLDED_THROTTLE = OM:11,SM:3,OST:OST_SPEAKER
+SPEAKER_MUSIC_RESERVED_CLAMSHELL_THROTTLE = OM:12,SM:3,OST:OST_SPEAKER
+
 
 ########################################################################################################
 # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@@ -43,7 +46,7 @@ SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
 # This can be configured by Waves or platform vendor.
 ########################################################################################################
 [HAL_SUPPORTED_CONTROLS]
-SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE|SPEAKER_MUSIC_UNFOLDED_THROTTLE|SPEAKER_MUSIC_CLAMSHELL_THROTTLE|SPEAKER_MUSIC_RESERVED_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_MUSIC_FOLDED|SPEAKER_MUSIC_UNFOLDED|SPEAKER_MUSIC_CLAMSHELL|SPEAKER_MUSIC_RESERVED|SPEAKER_SAFE_MUSIC
+SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE|SPEAKER_MUSIC_UNFOLDED_THROTTLE|SPEAKER_MUSIC_CLAMSHELL_THROTTLE|SPEAKER_MUSIC_RESERVED_CLAMSHELL_THROTTLE|SPEAKER_MUSIC_RESERVED_UNFOLDED_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_MUSIC_FOLDED|SPEAKER_MUSIC_UNFOLDED|SPEAKER_MUSIC_CLAMSHELL|SPEAKER_MUSIC_RESERVED_UNFOLDED|SPEAKER_MUSIC_RESERVED_CLAMSHELL|SPEAKER_SAFE_MUSIC
 
 [COEFS_CONVERTER_SETTING]
 AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
@@ -57,22 +60,26 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
 #AudioFormatIncrement=8
 
 [CUSTOM_ACTION_257]
-CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0|3,PRESET:SPEAKER_MUSIC_FOLDED
-CASE_2=PRIORITY:1,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_CLAMSHELL
-CASE_3=PRIORITY:2,NUMBERS:2:0|1:1|2:2,PRESET:SPEAKER_MUSIC_UNFOLDED
-CASE_4=PRIORITY:3,NUMBERS:1|2|4194304:2|3|4:1|2:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC
-CASE_5=PRIORITY:4,NUMBERS:1|4194304:0|1:1|2:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC
-CASE_6=PRIORITY:5,NUMBERS:2:0|1:0:0|3,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE
-CASE_7=PRIORITY:6,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE
-CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:2,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE
-CASE_9=PRIORITY:8,NUMBERS:1|2|4194304:2|3|4:0:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
-CASE_10=PRIORITY:9,NUMBERS:1|4194304:0|1:0:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
-#CASE_11=PRIORITY:10,NUMBERS:2:0|1:1|2:1|2,PRESET:SPEAKER_MUSIC_RESERVED
-#CASE_12=PRIORITY:11,NUMBERS:2:0|1:0:1|2,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
+CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED
+CASE_2=PRIORITY:1,NUMBERS:2:0|1:1|2:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL
+CASE_3=PRIORITY:2,NUMBERS:2:0|1:1|2:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED
+CASE_4=PRIORITY:3,NUMBERS:1|2|4194304:2|3|4:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC
+CASE_5=PRIORITY:4,NUMBERS:1|4194304:0|1:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC
+CASE_6=PRIORITY:5,NUMBERS:2:0|1:0:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE
+CASE_7=PRIORITY:6,NUMBERS:2:0|1:0:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE
+CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE
+CASE_9=PRIORITY:8,NUMBERS:1|2|4194304:2|3|4:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+CASE_10=PRIORITY:9,NUMBERS:1|4194304:0|1:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+CASE_11=PRIORITY:10,NUMBERS:2:0|1:1|2:2:1,PRESET:SPEAKER_MUSIC_RESERVED_UNFOLDED
+CASE_12=PRIORITY:11,NUMBERS:2:0|1:1|2:1:1,PRESET:SPEAKER_MUSIC_RESERVED_CLAMSHELL
+CASE_13=PRIORITY:12,NUMBERS:2:0|1:0:2:1,PRESET:SPEAKER_MUSIC_RESERVED_UNFOLDED_THROTTLE
+CASE_14=PRIORITY:13,NUMBERS:2:0|1:0:1:1,PRESET:SPEAKER_MUSIC_RESERVED_CLAMSHELL_THROTTLE
 
-# Action 257 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t, folded_type_t, sound_usage_t(optional)
+
+# Action 257 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t, folded_type_t, sound_usage_t
 # - audio_devices_t : current active device
 # - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
 # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
 # - folded_type_t: 0 - Close, 1 -Clamshell, 2 - Open, 3 - unknown
-# - sound_usage_t(optional): 0 - Music, 1 - Movie
+# - sound_usage_t: 0 - Music, 1 - Movie
+
diff --git a/audio/felix/tuning/waves/waves_preset.mps b/audio/felix/tuning/waves/waves_preset.mps
index 732269bcff74889eda08d7f17e72b6513ee5d29c..bbc51a8453568354334d49d1f28c5b7bdced6c79 100644
GIT binary patch
delta 4873
zcmc(je@vBS6vv<QzSj#EuDn3eoKv~ok`Q5BSwlnSRTG?TdGQa-<`1|knHzZ#7&*{%
zt5mdPb(?QxQ?aGX^<#QlufMh|Gv+cuCkvUzA2k`~K%JzuSe^Hr=i&<&1guTRA0M9g
zInVi?^PJ~75B}Dac<5B3eRjdD=Rd7KWPc8P(}fV~GjjuhRi!0G`BOYarT#T5D^~c+
zN+uTs$}7wLt1F8FWhHA|IPCJ5mbzXEtSqT0%JO7oO_}1EI$^I(*gRsE+o9k>q9(K%
zyqX?$8D2L|+SGd6=yR%wHowq6!|zaAVuRJE7ul<~L-qC)eeG(P5yhOVFF2|u>#hSf
zr@mtw#Du5ZTn)?QluCVprX&Y1|1cjv3e$dpN6FTheQuB%qTT*SBOTkKjm!>s+Gf8{
zAud#0)61eDKg<P3)wE#z%5nHRnBSli7KXV%Q(g+sLw8f-$UIem0vHtNYeUN8js_Px
zj~8O8zG<^<TxidnNdqWIfY6sc#~pU9OlW0eSb*eS0a_WD-$;OD5+LVMyv%z|mo9W^
zK)jMau)E|FiyeByQ?SUc3BVscAyb(V#XN`d9SpqT&|k|`lEO3Ic}Gdpe@=yTIc*8&
zyy#hnKEb18gr~6(A#klTt{9p4i*K$NKnExOq8ilpPqPPaiQugO?;CTfa9A^GxUiIZ
zGa1}7C*AlbNxc+z-=f0ICZG7qF{%?9JExmP<+T&`tEpHy0ZXcgC-hd7Z&ar+ZT+)t
zQ{xDam_p3_>QJs!D&nkBd_}zop>NK#I1Q}uCr3rr80lE*2u`}X%&yf6tu|-p0b53V
zlaVKicjN(RwfK|MPgM*~HHURf{X)q>e|uGUm{U!wrHUA9uDr>Zd26mJ49^GZF))f^
z;qQb&<Slm4M))QR-{flE2<DmQYFtp|%6oC4>wg>`EX42{2Zit8=W-3=neJGw1^wV8
z*n=24U-FneZr;rIMejW@Pv85i>NlD^FeduGyZVumgeMID-SA#@^qLEypWg>#aBbuK
z4t2DHu9L1b=t`Tx*9mh(lI0Y-PMCW)f4;pdO_=tSYUWfCYfZJ`!oaMlP7k)h+@S*8
zAEmqU)ROx~nE=7$6UoDlv@Q+m(*EK|nIj^VQz%kqOQdya!nCJInU9#Exh#dQW1)}b
z(2kh(zRWhz2I{zhV-0UP+>9FhI1D#5{bVf^+nWv1Y;^ZMGR+3ySVW9G%twZqj*J|p
z=y<hQw-ZCb)}$Zb4x3dm_ORi<qUOgLo9dOF1Jrj*tlqTTR$#C3LXCGnYRQ(U;~kwJ
z=5J@&=7;%)Wt<$>cm<j|-MP}S_cPcse8;{X@b%mx$BgV)GC7t^jwO?0Uynf3LN}-s
zvGM&`ST*Q{jGfSTN%$^(%#BELZzJ+u0`nU+BFWT<<UICA_SgzlK!^8Qp?dG64ABZ3
zyG3L7Ppm+4uY$&IFu#!k$)rHeqnnz{u@kED;u=OLTxWxIwrku8nfrG_Ipba@<bfsq
zI-#6KnOJ8NxaeHBLuP)bN68!3JLq;c+|F+1<IEgU>T(JlXJ*TBzMU;hdlJEn{nWZ0
z*iS9nF_L~7a@gDIp{>4z)iFn?lT%0?vqfE7y)f-b9W!=S-m3@fsvFwHhW3eluZRup
zfMXHLc$lvUX1XHeFlpk|&beabwtexg^75buM!sOQM4=^ia7@hDm8}`auG}}{Bk0QG
zuZ!{5zvIQ3u`7p*dzfAM&T?^QxqKQk=euJ$K>g3#$|plLt^cnp2Rb3p`8$^nbHpae
zDO5hpmhuU73e%ppiW$4IHPzUa`=<I~b>*sbs7l|)kupa_DyLAS%$7*2(uHYHkuqaf
z?t4%kT360&5Sb1Aj$CE~;8;YAJj_RqnU0(srs#OJ1h-RGWc&;2Tf=XTfn5;T)k4jY
zk(;ArYL1erIZEaN+9l95(VZ(DfB35U_V68NIw8|pOpY1Zv1D>AnH)>zh@ApWQ-#y|
zp2T0Rg}ljyuM`)(!Qz$KdebpAE3B>YkwG8w{8GtDft-|7lE%o=B$G7BBuz3&%SjPv
ziq6BOHe%<k2DBP4l5<9OE}5K5Cg+mLd8;ANG*#sG%}Z|Iyx=410rS$;3SF&VlQc$_
zCYhv3CTWsMT34$;(@id{l?QZQm;r?u`^Y&XJC{t(C6jZ><h(FLpy@`lBCLOKOdMHN
zRIG=J^-quhMiwBM1V|<Ul1V_tdV!`JU6}g+AVAv<+U_4o03!>KOadg60Ldgk+bz(v
zV*-{X3Rq14r-Cn+i3XmFq$K=P|8!L7=BZlHf6>)x+TE>icWYtC1l+8lXWQ$xK;4!V
F{{plFmD2zK

delta 5293
zcmeHLU2GIp6u#%quw{R2*FptJmD!dwV%+R@+bK0}tPoj{l%GZ=hBT~OEU2kzm6}LP
zq?TAPf*UhQFJvF87!A_YQa5o(t+ogV8xvZaMtvbx;|ri}(Zql+c<%gcr*$WNq2*=w
z>71E+=A8T8?|gG+2hJ7#Hdg3Zw{7j_`jZ2WO;A-r2oa<W&CPq78l#c&U^Ld$B)!u7
zLgU_OZEZ9Z428<egVonQ5s4Ti9g>scdeWBcftmt!>U~jmB&B5+UF>kDSX~f50r3+z
z)|G&<=-1NNQg!tk;=O>2{&uKa|A0!-(H|rIF<E)5F=ChudW47B?Hf>x7Xa@u-(RrZ
zv|E<Y-Db=$yQ>QHaG3xFtb{7TYrgv;ZnBuyg}<qqK?(DF38`nJo#NW=<8({1W0gOj
zeejytm|R)0Y7sB#hsA1#m;M8eL_0~e4{O!vrlp!hJK#ON8pGDAF=BW%hRIV(m{RpE
zr4en<n4qN>x`9oG=yQ(oJ{a#i&%R$Sgjh=j_2lUno@8~5u4M6NsZ%-KRb(#1?XPC(
z3hFnO)w5TZ;IiR&!NqDT=_AHEg%>d1NASr*lFPvS(xF|mF`p0=@5yS1TuS89r?nv6
zl!?<0!&CgAtr+I9$rZweWDWJ_s|aK?UmaN^{0WZHG8iq3@Qpog+S?edGVQwig`Ii&
znpSNS%9Tr77nKo=QOZ+m@-?fMC*$a`y2pf8Wh_#xPEm0Xk|W>!<l!Xy_a2_@7_igb
zbSFNVhqHnGg1=x)T~D5WZ#`fUS{>Hh97QF3)o<kAujh|n-EI^&U4Tqnc0derU^75`
zah$fB`@f^~!6exM*yK?I%i(jAvkOS61Cm>(6ua^e^x(<&<o~bX1D7Fi`DdB9?ch7b
zACiF&dvShwgvqkQxG+5GlspDxLr0*?Br<l)<jX?0c7&P|nsT|L0d_QebWjQ#L8;H+
z(40Z>N{Cm+HkN=u@YkmPI0k!WH#~}LdV-`Uj%u=|n-*D1PXON2WzDcPSu<j|s^}()
ztN@rLyT}SN4ptXgLmTdBZ{SY(p)R<zuF$2mOLFQ^<0%0t-2D39mv*t>O`6Ew5}_1?
zQoSgxcF3W$&O~m0TLP1D^zN3lo|Rk%Q9nIKUz|-;<IR-5Mbfw0v^SG(q9EJBhk|T@
zZ~g??4z{}|$Ztz-9ZFVqlYX3?eSri75>KHZ+rfu|Y=Lk71=$Y9g%RY#lE;9|T`wG&
zTU(tFcecJGg^i#G-xQ9{8FZ!}&h$Sa6OY|H5O3L?#_v9SVPJdiV>mZHpbSGu^&S+9
ziWF&?`v4(dIx}M}AwyQ@E35Oh)fu)rBUb0E)%nKioU=OT4d+o5enKu-Z+&ZZE?S+G
z)lt0{;2D=W0^*#O83%FDkC@kQH;7wI`@`w$(^DCOqp>FkP6o7TaAXp;=UdpGZ#Zk@
z_{MDbhJBv{Cp$RTxl-XEzmI=Z7w42}#s}<mAGTEv99!mS6Gx6YS!5iUlLH6;%$X&~
I`aeYf0fl`~F#rGn