From e527c90525c89045ec90b519a0f0416b439fb4aa Mon Sep 17 00:00:00 2001
From: Cathy Hsu <cathsu@google.com>
Date: Tue, 21 May 2024 08:38:22 +0000
Subject: [PATCH 1/2] display: remove display RRS default Config

TG4 doesn't support RRS; therefore, remove the related settings.

Bug: 341870097
Test: No error msg 'kernel doesn't support mode: 960x2142@120'.
Change-Id: I9acb3cbd48c53a4f21c1ec15d811aa6fb7a39b0d
---
 device-tegu.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/device-tegu.mk b/device-tegu.mk
index 44a8194..5ef1bb7 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -272,11 +272,6 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
-# Display RRS default Config
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=960x2142@120
-# TODO: b/250788756 - the property will be phased out after HWC loads user-preferred mode
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.preferred_mode=960x2142@120
-
 # Display LBE
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 

From 57152fcb1e3c5628737bb12d6e360a5c89c04911 Mon Sep 17 00:00:00 2001
From: Rios Kao <rioskao@google.com>
Date: Tue, 28 May 2024 09:36:51 +0000
Subject: [PATCH 2/2] audio: Update templete.xml, recording.gatf and
 audio_platform_configuration to leverage RC setting

- Update PGC, AGC and SNS settings for camcorder use case
- Update PGC, AGC and SNS settings for recorder use case
- Add SA-Lite in voice recognition use case for enabling MIC COMP function

Files from the latest attachment on b/343141249

Bug: 343141249
Test: verified by cartercheng@
Change-Id: I57052a1be4992a9a11fc83a67c189d033cb6a0ba
---
 .../audio_platform_configuration.xml          |   2 +
 audio/tegu/tuning/bluenote/recording.gatf     | Bin 103372 -> 103616 bytes
 audio/tegu/tuning/bluenote/template.xml       |  89 +++++++++++++++++-
 3 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/audio/tegu/aidl_config/audio_platform_configuration.xml b/audio/tegu/aidl_config/audio_platform_configuration.xml
index c8fde1a..2e47f46 100644
--- a/audio/tegu/aidl_config/audio_platform_configuration.xml
+++ b/audio/tegu/aidl_config/audio_platform_configuration.xml
@@ -106,10 +106,12 @@
     <enablement useCase="primary-capture" deviceInterface="microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
+      <source>VOICE_RECOGNITION</source>
     </enablement>
     <enablement useCase="primary-capture" deviceInterface="back-microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
+      <source>VOICE_RECOGNITION</source>
     </enablement>
   </spatialCapture>
 
diff --git a/audio/tegu/tuning/bluenote/recording.gatf b/audio/tegu/tuning/bluenote/recording.gatf
index fe4ec7b4a53233402f88b60a7e199684f6c7bff3..c52ed057f23404406cf758553cd1bad48b7dfaba 100644
GIT binary patch
delta 2784
zcmX@JobA9$w#1UsyyP8I7#Ye^i}F|)7#J9V7$}y0Mv#FawInfJ0m%Ol_i)>kxDff5
zQWyR)T{)z>ey7x{GS(j~+ZNxp?pbR0AUn0Pm;<N|3>x?iQW8rNdw}|xfC4QO6Z0o`
zeDq*?&b*mV-hhS6!GVDRf+zEQGnrg-tY`b5cE%@6+XFfoCooPg=wTF}{GKad@_Zl`
zVDa4?aPJZ0<Vkz{7}+LI+~Ys#e8j{WiOB`$)fgG3cTZr{RaNj~U=RaZ1aiC_5Q{_E
zcUT!1G=OX%#qeSJ-3g55j5{VPUdU!lnd~T_%G6*#`2fETl(PUQhX`d81%m@SgfT;H
zQQ@kEtUAnn|F6ee^xka!*t5#c_Lmaxr700T2iL9jyNwcR4#Mc6COzF}0;9?#d7jA&
z<aj0*d^Fg6=inBWi7zas?`db0;0#$?XYaW7-~N#8ciS1;8S(Rr!QslmvqR4CAlG%}
z1DY}04@_ocap5sG_CNTrYR`dLGc6$k{fDL=_@=>gkb$9LKS%}FVNC{xGJOVyNGl-M
zjVlQlq*t^V7}{*X+*7g)44YLL82*`nxIpt&9T*rC9M7K7aRBM&S?6vD7AUk8a|CO6
zV827I6f6XipZtY4W)fe(BtDnP0em{3Se@QAfl*@eE<Um8JAl4t`oJ`~Zm-_t1|g36
z9l+FNv_{b0c+Et65WOe5&|YTMD!av>j@vH&<h~C?!^AFBDA-@9SOCNd_R_z5?Zt1M
zwp;UdvhA9;!uvopOzZ_SFmV7u0GMpB2l^U}Q^0%}vF#88!zM)_0Rjj`=<LZK_NnPX
z6frP>^^7zv3cx&%3RtIiPG*#^-@(nm019hJcpn3X3k)NagW>?a;Hi1ByEJIs^W@J>
z8?xj)?B6&2NX-0gxoNAy{i!W)q^}vFWT69S1rN|Moxt4B$G|W#+jnx!WrN8JJ{k<`
zV#owm3{6;%D7<sK)$gyU2x^y!v)a*Un$h)Z-LB<l>~C)A6{u02``=S=vWSq1paW0?
zsN}Z*(hb0JTWES=JEQiriHstXeV+PY6wsUF#m_S#3gyic-acTSyhbhod+1uQ@&k?j
zvf1++w*ad$kf{O8``VI9K$ZXy^8zub00$M+pgg58*^yP4Q4vH=4`E|;n7)9G(STJR
zD919{F-3U$9X7^-PD(0)z<rS{I)@6xC$HNlqYBEX>wwq;h#edud0GKV!}7Yr<oEmZ
zajIMZFE)TCkfc)G?g7xI4+kN|1;`aaI9*|EycuZE0w*NwIBCC_9=ZuhI89(+IA9Mh
zqe#~>*^HHMde3A=nF!RJ+yt~N28tDc^a-F>P8<Z)$e^5zoC>x53nlBm=kR~`ed+q%
qNbu8*w`~nh4pX!(z6*6$mb{goeB%ifQlSIOXbK$WDNuvh6bJw|8X8dm

delta 4542
zcmX@GlI_fLw#1UsyyPR385zn_i}F|)7#J9V7$}y0LXd$WwInfJ0m!!r+4yAMOSxOy
z+0(P))BY?tIm!N_`nM>l=O-m9yIU&_vr{XJIe_XQK)@g+u_UnrsGkWa&@eGEe{zM2
z#O6IhTUaJ9cq%bDMl+#)>1%QOv_Bh{Ft=T>mF!{L|4T8+?##m)`)iXf?DsyC0;a{+
zCE5#$*4fvYZQgIREDlUN?~buI+Ei`-%3|66xy4an`hseh{iM7a`;W`b_H*A)0Mm1Q
zW9=u+$+4IC@49dKTs|;eT=LDXLb}?X<#J`copN$Ah+#LYF3x_LWwrfnsULQWgj2w@
zyKlVxmF{YL?{6XY7GF}qG*3gKeP39yy~WZH`$wNm!E}L_rhWC-YJ2wZK6{b43^3gn
zoMJ!sbfx|K^IPpN-OL2jc}tV+VSxjoC-bv}O%~9$!5R*)zE#^x?AW+p_H+!GW<L~R
zza=lse)VS2eX`Rh*nw!_OJ8lFenIidCEX(X)7tOt4DUvRX=ZLetX`Q=lx!b*$j#JV
zQb-HLuwU82i`6eCr)%t6)A!oHx6cLBO59oYlNnhSY+j(Vig7ZZb--jVJ>SU!EWVp3
zyne)}$jHC~OhI_?<o~?NljZDqWI?JJkW?bG8G)+QC+FGuO%C7_nQWmT!N@o{R#SYk
zjS>Ikej(1uIVwDpdlV#8L4hd-HU-3DU=Rmlkf|V`0mQ68{ATi8BXh<rlXdyC8M!7q
z3aBzMI7~jkuR}S9b@D{PU;|KIky($(D?iUkFFm_NPwncZ6NXlk7w(_xc3r@&CcsAF
zVxQE+4z`1n516WOommITXh+sferGxfYbqGc4Ukgd`;J<BUzdyfzxSnr>38nQ_B6^N
zo+!B;nnlRXAwA$6vYF5N3=@gD0y+O+<ciICc3v!#-v}9O{-DCdGFeXCZt{U|EUetX
zl-{!0(4AXgx(hp_!{h`7p6M;@j0W2eurt<l0<(}2lfuEtISNXXckzi$UZSAF2+J3_
zk0Mzd4mrqAKJ`dOb;BVBh7~|80K^WC3=9pxa!Ub7GdMulApV8P@sIUYL8=x&RW{&L
zsYaBU4wDxss_A_I8uZ~H0|Q9Q8X*1wWFtF60m&I2PFS_b0JY)Lasj(71huFzGEUE(
z!l+%}A<V!4!wd|KK&xO_0mz16^t$uh(#c#^zt%VX+7fLo?64-Nt8-HE&YD}+OYV1V
z$&5VKfl_xi@T1n9z&f-OSc>rhV*pscPRy?ytwn)B0RyA8C`q-boz#niLcp+t)R0>a
z0TVNn{o>%{2?`>UFYxh5D)=F)(HG2gt44j%v(3b>cRC;CPCZ-yPO#(nb>;O20X-k=
zjGtKa7h8V(@%Ky^O13$GmTe{`hEGmVF(8~-XjGA4t4GLhYT;}sj<6;IutF_kAtJ>C
zTbD%ExQG_!V9pyDP0W>xcIUqHwYjv_s$k>U4<GKt$f(QqFZs>gWPJWlU|<%@<cO!E
zO-xuN0ip3$6{Af|c#{*<@d7q6UolVq@G)VunaRK~0L@GlSQ8UOBbu0?rY5492>^Od
B_U8Zq

diff --git a/audio/tegu/tuning/bluenote/template.xml b/audio/tegu/tuning/bluenote/template.xml
index 54eba56..dde1524 100644
--- a/audio/tegu/tuning/bluenote/template.xml
+++ b/audio/tegu/tuning/bluenote/template.xml
@@ -17,8 +17,8 @@
       <param id="18" name="noiseGate" type="float"/>
       <param id="19" name="minGain" type="float"/>
       <param id="20" name="maxGain" type="float"/>
-      <param id="21" name="longGainAtRt" type="uint32"/>
-      <param id="22" name="GainAtRt" type="uint32"/>
+      <param id="21" name="releaseTime" type="uint32"/>
+      <param id="22" name="attackTime" type="uint32"/>
       <param id="23" name="rmsTav" type="uint32"/>
     </module>
     <module id="6" name="Surround Record">
@@ -26,7 +26,6 @@
       <param default="48000" id="1" name="fs_" type="uint32"/>
       <param default="3" id="2" name="numCh_" type="uint32"/>
       <param default="7" id="3" name="chMask_" type="uint32"/>
-      <param id="16" max="1" min="0" name="alpha" type="float"/>
       <param complex="true" id="17" name="ch0_profileL" size="1024" type="float"/>
       <param complex="true" id="18" name="ch1_profileL" size="1024" type="float"/>
       <param complex="true" id="19" name="ch2_profileL" size="1024" type="float"/>
@@ -43,7 +42,28 @@
       <param default="0" id="27" name="ch0_assignFrom" type="int32"/>
       <param default="1" id="28" name="ch1_assignFrom" type="int32"/>
       <param default="2" id="29" name="ch2_assignFrom" type="int32"/>
-      <param default="0.333" id="30" max="1" min="0.01" name="alphaEnhancedRate" type="float"/>
+      <param default="0.33" id="30" name="alpha_enhancedRate" type="float"/>
+      <param default="0" id="31" name="swapOutputLR" type="int32"/>
+      <struct id="32">
+        <param default="0.0" name="CB_alpha_lowband" type="float"/>
+        <param default="0.0" name="CB_alpha_midband" type="float"/>
+        <param default="0.0" name="CB_alpha_highband" type="float"/>
+      </struct>
+      <struct id="33">
+        <param default="0.0" name="CB_epsilon_lowband" type="float"/>
+        <param default="0.0" name="CB_epsilon_midband" type="float"/>
+        <param default="0.0" name="CB_epsilon_highband" type="float"/>
+      </struct>
+      <struct id="34">
+        <param default="13" name="CB_fc_low_mid" type="int32"/>
+        <param default="22" name="CB_fc_mid_high" type="int32"/>
+        <param default="5" name="CB_smooth_span" type="int32"/>
+        <param default="1.0" name="CB_forget_factor" type="float"/>
+      </struct>
+      <struct id="35">
+        <param name="IIR_lowpass" size="5" type="float"/>
+        <param name="IIR_highpass" size="5" type="float"/>
+      </struct>
     </module>
     <module id="7" name="Multi Channel IIR 2">
       <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
@@ -59,6 +79,64 @@
         <param default="4" name="type" size="60" type="int32"/>
       </struct>
     </module>
+    <module id="8" name="Multi Band DRC">
+      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
+      <param default="48000" id="1" name="fs_" type="uint32"/>
+      <param default="2" id="2" name="numCh_" type="uint32"/>
+      <param default="3" id="3" name="chMask_" type="uint32"/>
+      <struct id="16">
+        <param default="1" max="3" min="1" name="numBand" type="uint32"/>
+        <param name="IIR_LowPass1" size="5" type="float"/>
+        <param name="IIR_HighPass1" size="5" type="float"/>
+        <param name="IIR_LowPass2" size="5" type="float"/>
+        <param name="IIR_HighPass2" size="5" type="float"/>
+      </struct>
+      <struct id="17">
+        <param max="20" min="0" name="band0_delay_ms" type="float"/>
+        <param default="5" max="20" min="0" minInclusive="false" name="band0_rms_ms" type="float"/>
+        <param max="30" min="0" name="band0_gain_dB" type="float"/>
+        <param max="30" min="-30" name="band0_Min_Gain_dB" type="float"/>
+        <param default="1" max="3" min="1" name="band0_numOfKnee" type="uint32"/>
+        <param name="band0_threadhold_dB" size="3" type="float"/>
+        <param name="band0_compressRatio" size="4" type="float"/>
+        <param name="band0_kneeWidth" size="3" type="float"/>
+        <param name="band0_attackTime_ms" size="4" type="float"/>
+        <param name="band0_releaseTime_ms" size="4" type="float"/>
+        <param name="band0_hysteresis" size="4" type="float"/>
+        <param max="20" min="0" name="band1_delay_ms" type="float"/>
+        <param default="5" max="20" min="0" minInclusive="false" name="band1_rms_ms" type="float"/>
+        <param max="30" min="0" name="band1_gain_dB" type="float"/>
+        <param max="30" min="-30" name="band1_Min_Gain_dB" type="float"/>
+        <param default="1" max="3" min="1" name="band1_numOfKnee" type="uint32"/>
+        <param name="band1_threadhold_dB" size="3" type="float"/>
+        <param name="band1_compressRatio" size="4" type="float"/>
+        <param name="band1_kneeWidth" size="3" type="float"/>
+        <param name="band1_attackTime_ms" size="4" type="float"/>
+        <param name="band1_releaseTime_ms" size="4" type="float"/>
+        <param name="band1_hysteresis" size="4" type="float"/>
+        <param max="20" min="0" name="band2_delay_ms" type="float"/>
+        <param default="5" max="20" min="0" minInclusive="false" name="band2_rms_ms" type="float"/>
+        <param max="30" min="0" name="band2_gain_dB" type="float"/>
+        <param max="30" min="-30" name="band2_Min_Gain_dB" type="float"/>
+        <param default="1" max="3" min="1" name="band2_numOfKnee" type="uint32"/>
+        <param name="band2_threadhold_dB" size="3" type="float"/>
+        <param name="band2_compressRatio" size="4" type="float"/>
+        <param name="band2_kneeWidth" size="3" type="float"/>
+        <param name="band2_attackTime_ms" size="4" type="float"/>
+        <param name="band2_releaseTime_ms" size="4" type="float"/>
+        <param name="band2_hysteresis" size="4" type="float"/>
+      </struct>
+      <struct id="18">
+        <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
+        <param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
+        <param max="100" min="0" name="limiter_attackTime_ms" type="float"/>
+        <param max="100" min="0" name="limiter_releaseTime_ms" type="float"/>
+      </struct>
+      <struct id="19">
+        <param name="frequency0" type="uint32"/>
+        <param name="frequency1" type="uint32"/>
+      </struct>
+    </module>
     <module id="11" name="Stationary Noise Suppression">
       <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
@@ -207,7 +285,7 @@
         <param name="crossover_iir_hp2" size="5" type="float"/>
         <param default="250" max="1000" min="5" name="environment_rms_window_ms" type="int32"/>
         <param default="-40" max="0" name="environment_rms_threshold_db" type="float"/>
-        <param default="10000" min="0" name="environment_rms_attack_release_ms" type="int32"/>
+        <param default="50" min="0" name="environment_low_to_high_ms" type="int32"/>
         <param default="1" min="0" name="environment_loudness_ratio_band0" type="float"/>
         <param default="1" min="0" name="environment_loudness_ratio_band1" type="float"/>
         <param default="1" min="0" name="environment_loudness_ratio_band2" type="float"/>
@@ -358,6 +436,7 @@
         <param default="-30" name="drc_long_term_window_upper_db_band0" type="float"/>
         <param default="-30" name="drc_long_term_window_upper_db_band1" type="float"/>
         <param default="-30" name="drc_long_term_window_upper_db_band2" type="float"/>
+        <param default="10000" min="0" name="environment_high_to_low_ms" type="int32"/>
       </struct>
     </module>
     <module id="10000" name="Eraser">