From ba92db8b1dba2f4a4b8dc9d4f3867e472e15f87d Mon Sep 17 00:00:00 2001
From: Robert Lee <lerobert@google.com>
Date: Fri, 29 Dec 2023 14:35:48 +0800
Subject: [PATCH] audio: RC version tuning table release

- Add adaptive window parameters of PGC in templete.xml file
- Remove id="8" MBDRC in templete.xml file to avoid error log
- Optimize recording quality for concert use case in recording.gatf file

Files from the latest attachment on b/317946453

Bug: 317946453
Test: verified by cartercheng@
Change-Id: I73cf1b8dbdd6261fff9a5e85174e3a8ab9580747
---
 audio/akita/tuning/bluenote/recording.gatf | Bin 102140 -> 99760 bytes
 audio/akita/tuning/bluenote/template.xml   |  84 +++++----------------
 2 files changed, 18 insertions(+), 66 deletions(-)

diff --git a/audio/akita/tuning/bluenote/recording.gatf b/audio/akita/tuning/bluenote/recording.gatf
index 94297c076b27b5b4b8c2299d2872814a67c8bb14..e214d355c445e475366b803ee60b77c025ac421f 100644
GIT binary patch
delta 4549
zcmeHKeN0<b6h9AGDPJ8zmrbnFbyz+&CfgKYsoahbU{e$_oXMOrLL1oBhA-!~vd|e#
zSY|rrmGF-!BY?2YQO1b-(6m&|Sm+odQ=&4*OiYX+tb%N8H0rspywTPo5VHggO@95|
zcYEHi=f2*a-#v~xk?F7~t^7@0LCd=w?9rC$`~ZMM;9Q}s4M1C-Uns}xyS<MzU2a^f
z{HDKq-9~!MT$4T!nqHBul3z7O9IX;{9Zic0w4HL^`_(DB+tM4o{<NO_n$&ErE8EU<
z-{afJ`??D9+b4<Upc^}RuFHCb5-wKLoUA85L`<YKgll-t$jT$v4(rLYw{uC-?^>RN
z4f({lt&Ai!<&vMqp5nQ9ODxfk>xutMMk0N+h-c$g4XNwdM{Zr|B>ms*;#t>JK<GhE
zL$j^f;djm+AX#Zw&3BAio<}kY=mno=Ug(c6B|WQerL4RDGS9w2&wEXxy0n12XiX;%
zhsE*S`c8<qBxt1Xv5uiHPjd>e;1fisXF$CLb6XYLg+XR#qyZxhIA(VYP2FXgVl|5{
zrxl`LMe%Zgm{kB1aRA-x0ZfSi@2T+C6oC3o0BM;Rs-QNJOyWA7vKgl<;_B5HH3h(E
zz_A=zfcpM5hAZj$iz_7TBe&@ynk`n=KDM8Wq4&;7=t;4X>cn#T$GK42+byG#07Zv7
zV2dv&sm&|l;;G3N)iD_S`p4WbeW>l}WoLW<5;Y0QMy)BC@o?&-*-rD@!Yl3Vd&t;$
zP0HB#GM+Iz!v}3o;59#IW-QG8;)^3tTh)<_4Mc#3U4l3jz}|(=#tP7a2t}xI87z)1
z2h>75Kp&3lQxTQy%`4nRnP5GFi5g}T^{U6d$6b>pS~=%TXA!kyQo`y_qVPnQ`|9N`
ztIwR)s{F^*dy2|X*!7XRir#;u)8Zc5&egkXVpji7w02O(MO89s0af7u0sszT$^zs#
zc7jzsX~=Zdd(M9{YpkfGdUR!c;?HYF9WkSqRybs;lGNeyp@!?1tgmVJm5K2?oUhOX
zO@4X)wO{}roUjFh9~=Tdw(;*$hefqu3nKm8NA&=TU*~*^AHA_;dDwrb()o*k!`~O^
ziS9_xibp>@zoyo*pWExKa@?8EO7vWz4+r$-7m+)K{m7VAE&%|UxDN%e|Ev?9PTbmX
z;f;|jRe$Hk;`YmS```{)^rJ@_CxhPJaK(|6v)hlVEQ?m`aUNK-;=fsOhsjpGXv3+l
zHqZW%?&pO?8(t7LoYVSI=e@}jJ*(Slasx+9TXoqT%>hxHFUpsm9T=Dh>36eX%hDNb
zIH$J7z_p+kOCOZwvHpUFcEv16uSY*V&e89`mU=hZXnJHx(A;{JV(%@5a_&vZUhnNh
z-29pn?B~Q`=&REv97uPFBZPiLD)b=e$c^62*zJHQ7_qaR5R90yyBWJ45XTjt#;!d6
z<95}}0~>7LX8f6}$a_*E9j<a%V-D%p-hRt%XBuYSnY(CTd-dWWah4AGe|AXpx+N3l
Hdp`UNn|YeG

delta 6821
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
U6&_jxCC?JrTd>7`?td1(14BU*rvLx|

diff --git a/audio/akita/tuning/bluenote/template.xml b/audio/akita/tuning/bluenote/template.xml
index fd69ae9..75e5d87 100644
--- a/audio/akita/tuning/bluenote/template.xml
+++ b/audio/akita/tuning/bluenote/template.xml
@@ -59,64 +59,6 @@
         <param default="4" name="type" size="60" type="int32"/>
       </struct>
     </module>
-    <module id="8" name="[DISABLED] 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"/>
@@ -269,7 +211,7 @@
         <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"/>
-        <param default="150" max="1000" min="5" name="drc_window_ms_lowaop_band0" type="int32"/>
+        <param default="100" max="1000" min="5" name="drc_window_ms_lowaop_band0" type="int32"/>
         <param default="28" name="drc_gain_db_lowaop_band0" type="float"/>
         <param default="-20" name="drc_min_gain_db_lowaop_band0" type="float"/>
         <param default="-70" name="drc_thres_db_expander_lowaop_band0" type="float"/>
@@ -290,7 +232,7 @@
         <param default="12000" min="0" name="drc_release_ms_upward_compressor_lowaop_band0" type="float"/>
         <param default="12000" min="0" name="drc_release_ms_linear_lowaop_band0" type="float"/>
         <param default="5000" min="0" name="drc_release_ms_downward_compressor_lowaop_band0" type="float"/>
-        <param default="150" max="1000" min="5" name="drc_window_ms_lowaop_band1" type="int32"/>
+        <param default="100" max="1000" min="5" name="drc_window_ms_lowaop_band1" type="int32"/>
         <param default="28" name="drc_gain_db_lowaop_band1" type="float"/>
         <param default="-20" name="drc_min_gain_db_lowaop_band1" type="float"/>
         <param default="-70" name="drc_thres_db_expander_lowaop_band1" type="float"/>
@@ -311,7 +253,7 @@
         <param default="12000" min="0" name="drc_release_ms_upward_compressor_lowaop_band1" type="float"/>
         <param default="12000" min="0" name="drc_release_ms_linear_lowaop_band1" type="float"/>
         <param default="5000" min="0" name="drc_release_ms_downward_compressor_lowaop_band1" type="float"/>
-        <param default="150" max="1000" min="5" name="drc_window_ms_lowaop_band2" type="int32"/>
+        <param default="100" max="1000" min="5" name="drc_window_ms_lowaop_band2" type="int32"/>
         <param default="28" name="drc_gain_db_lowaop_band2" type="float"/>
         <param default="-20" name="drc_min_gain_db_lowaop_band2" type="float"/>
         <param default="-70" name="drc_thres_db_expander_lowaop_band2" type="float"/>
@@ -332,7 +274,7 @@
         <param default="12000" min="0" name="drc_release_ms_upward_compressor_lowaop_band2" type="float"/>
         <param default="12000" min="0" name="drc_release_ms_linear_lowaop_band2" type="float"/>
         <param default="5000" min="0" name="drc_release_ms_downward_compressor_lowaop_band2" type="float"/>
-        <param default="150" max="1000" min="5" name="drc_window_ms_highaop_band0" type="int32"/>
+        <param default="100" max="1000" min="5" name="drc_window_ms_highaop_band0" type="int32"/>
         <param default="28" name="drc_gain_db_highaop_band0" type="float"/>
         <param default="-20" name="drc_min_gain_db_highaop_band0" type="float"/>
         <param default="-70" name="drc_thres_db_expander_highaop_band0" type="float"/>
@@ -353,7 +295,7 @@
         <param default="5000" min="0" name="drc_release_ms_upward_compressor_highaop_band0" type="float"/>
         <param default="5000" min="0" name="drc_release_ms_linear_highaop_band0" type="float"/>
         <param default="8000" min="0" name="drc_release_ms_downward_compressor_highaop_band0" type="float"/>
-        <param default="150" max="1000" min="5" name="drc_window_ms_highaop_band1" type="int32"/>
+        <param default="100" max="1000" min="5" name="drc_window_ms_highaop_band1" type="int32"/>
         <param default="28" name="drc_gain_db_highaop_band1" type="float"/>
         <param default="-20" name="drc_min_gain_db_highaop_band1" type="float"/>
         <param default="-70" name="drc_thres_db_expander_highaop_band1" type="float"/>
@@ -374,7 +316,7 @@
         <param default="5000" min="0" name="drc_release_ms_upward_compressor_highaop_band1" type="float"/>
         <param default="5000" min="0" name="drc_release_ms_linear_highaop_band1" type="float"/>
         <param default="8000" min="0" name="drc_release_ms_downward_compressor_highaop_band1" type="float"/>
-        <param default="150" max="1000" min="5" name="drc_window_ms_highaop_band2" type="int32"/>
+        <param default="100" max="1000" min="5" name="drc_window_ms_highaop_band2" type="int32"/>
         <param default="28" name="drc_gain_db_highaop_band2" type="float"/>
         <param default="-20" name="drc_min_gain_db_highaop_band2" type="float"/>
         <param default="-70" name="drc_thres_db_expander_highaop_band2" type="float"/>
@@ -404,6 +346,18 @@
         <param default="0" name="limiter_gain_db" type="float"/>
         <param default="10" min="0" name="limiter_attack_time_ms" type="int32"/>
         <param default="50" min="0" name="limiter_release_time_ms" type="int32"/>
+        <param default="1000" max="10000" min="100" name="drc_long_term_window_lower_ms_band0" type="int32"/>
+        <param default="1000" max="10000" min="100" name="drc_long_term_window_lower_ms_band1" type="int32"/>
+        <param default="1000" max="10000" min="100" name="drc_long_term_window_lower_ms_band2" type="int32"/>
+        <param default="5000" max="10000" min="100" name="drc_long_term_window_upper_ms_band0" type="int32"/>
+        <param default="5000" max="10000" min="100" name="drc_long_term_window_upper_ms_band1" type="int32"/>
+        <param default="5000" max="10000" min="100" name="drc_long_term_window_upper_ms_band2" type="int32"/>
+        <param default="-50" name="drc_long_term_window_lower_db_band0" type="float"/>
+        <param default="-50" name="drc_long_term_window_lower_db_band1" type="float"/>
+        <param default="-50" name="drc_long_term_window_lower_db_band2" type="float"/>
+        <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"/>
       </struct>
     </module>
     <module id="10000" name="Eraser">
@@ -434,7 +388,6 @@
         <moduleRef id="7"/>
         <moduleRef id="5"/>
         <moduleRef id="40"/>
-        <moduleRef id="8"/>
       </block>
     </signalflow>
     <signalflow id="2" name="General Mic Recording">
@@ -443,7 +396,6 @@
         <moduleRef id="7"/>
         <moduleRef id="5"/>
         <moduleRef id="40"/>
-        <moduleRef id="8"/>
       </block>
     </signalflow>
     <signalflow id="1000" name="Smart Feature">