From e5dc65c64a99be4604a765c33884739f628481bc Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Fri, 2 Jun 2023 09:48:07 +0800 Subject: [PATCH] audio: update waves tuning for phone call waves_config.ini - support phone call mode w/ new OM and preset name waves_preset.mps - add lite tuning preset in OM9 (only using PEQ non-discrete + MaxxVolume limiter) Bug: 285360691 Bug: 285361118 Test: manual test Change-Id: Ia3d1d6e5dba1f8cfa445a0744b3c5597e47a95f2 Signed-off-by: Jasmine Cha --- audio/husky/tuning/waves/waves_config.ini | 14 ++++++++------ audio/husky/tuning/waves/waves_preset.mps | Bin 146630 -> 173678 bytes audio/shiba/tuning/waves/waves_config.ini | 12 +++++++----- audio/shiba/tuning/waves/waves_preset.mps | Bin 153420 -> 184822 bytes 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/audio/husky/tuning/waves/waves_config.ini b/audio/husky/tuning/waves/waves_config.ini index 05c18e3..6aee28d 100644 --- a/audio/husky/tuning/waves/waves_config.ini +++ b/audio/husky/tuning/waves/waves_config.ini @@ -19,7 +19,7 @@ SR_COMMON = 48000 # This can be configured by Waves or platform vendor. ######################################################################################################## [HAL_ORIENTATION_SUBTYPES] -OST_SPEAKER = 0:12,90:13,180:12,270:0|13 +OST_SPEAKER = 0:12,90:13,180:12,270:0|14 ######################################################################################################## # This defines available preset configurations. @@ -27,9 +27,11 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13 ######################################################################################################## [HAL_SUPPORTED_PRESETS] SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER -SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER +SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3 +SPEAKER_SAFE_MUSIC_THROTTLE_LITE = OM:9,SM:3 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER -SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER +SPEAKER_SAFE_MUSIC = OM:10,SM:2 +SPEAKER_SAFE_MUSIC_LITE = OM:9,SM:2 ######################################################################################################## # This defines available CONTROL configurations. Only define the CONTROL if you need it. @@ -37,7 +39,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|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE +SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE_LITE|SPEAKER_SAFE_MUSIC_LITE [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so @@ -52,10 +54,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so [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_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_MUSIC_LITE 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_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE 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/husky/tuning/waves/waves_preset.mps b/audio/husky/tuning/waves/waves_preset.mps index b9e4b50ee5b673bd830f36394bff17e6facf6b54..458778fe285ede69f056b14a2c8b795e5be5418b 100644 GIT binary patch delta 4442 zcmeH~|4-Fb7{||Z(aXITMcPt9(R(RT3{pySPK$d%L~DGJ&{|CkCl_mpO64poV6K|A zX3@v-QI`m|+-h!w{BW73Ueth1ocRZ6w$_%bIhqqQV|JeBybl+CaM~~Z6ysc;&+9y& z^X2v2^SPJaTfS=pfjLF13d?E_d(>p56ea5ymE=*BqEsr!`lm-X&xGbVYcl;4s@{I% z&1hYyYRk6GHGv6LTchh=i@qMJT3;J&e)pl~BOAPBUwPEH$z78v9`Y`@N(-)j;znxd zL&VOh)8!V2qO{rKp8d~RJQ$@Ci|3zhwfIUc*%W8~_b+Lzcuo>!-;11b_8DF-6n|bNTkfj6br3XxSJcm57%1p`)dh2_szITeLrirDRz*0?M zt|qWl6PT+BEY-AFSF^rX@z_#LVBR^hrJBHO0az>mb2Whz)kGg_K%ZzZlZggksV1^n z39u*u=4t{x8e z@z`Ptm`x#DOaZegU@-;ErhpTs(8s3GC#K9~VhUJHA)8GBiz#3>1uUk3*^~*-vZ;YO zS{U?pc2H+WgE3`dF$FB9fY}tVm;z=~z+%c`ZK|_F@z`Ptm`x#DOaZegU@-;ErhpTs z(8s3GC#K9~VhUJHA)8GBiz#3>1uUk3*^~)$6nWgXCq1*femU0@@^10d7JrkmWn!@f zEVh8z7O>a?W?R5w%VKS7i(m2BVhfmUAzRxzI9_I#$0?}DLNdz&wz86O2fIR-xH40T zD`4&Fc_gzcP*G)KhgAWKDqwz?ny_o((4CO?LN;BH>Wu-mzk9(FGeQ_+k)osqSP zu37PQiHkqOPIW_Rtn~yPq)EHZMBYzyJ?MnKemvH2iuRDl7mwW`&rz?Fx#Y!IsGp+a zW5Jy?lVSrYw4GuTf1qQ@6H8L82dyGjKSUoaT^mvq-5y z{kOZ2Xwn+}yRX!VpSC$E8RttUEaSF6Be+a86)jUES@~yeR;p8dXnYz=mmg%fgBhNA zZoHU$$!6dhw|yf8oyc{+dvPO8b@S`U=VTw4g6`FBW3%r5@wCtV;ufW4>JsX8ak~=H ze|7t|(9W(u<>pQ5F8IB&yTGDSCs=M5l#)JoZAX~fnH#&p^-nz$wpot;1ko$yQtM_{ zs^9)aDHlhETJ2`SA_m>-h~UPtN5nw>u4Rshx&C)Y w1OxLCvA5sH5y8x3jtE8?dqfN@2>HkH5qV2KMbbwfk=Q^BwWit!=A#e%14X3+;Q#;t delta 2663 zcmX|?L1>&+6h_}0^{*r{F%m%}kWrzDREUB|K@n4^1Wb#iva- zF$`o3h^ZU5SZkc+ji0#je#P-iXDi;j@oL3iUi+%z z-J7+b|M2Jetr90r{`#lk5o;d|ix&?M@y`=4)FbAmKQpfP@-Q8r8D96?WzLNkUyn4d zxO@5Knx1;PKBD*Whv#d0@%BeUyfQ2}wOg;~zq3BPZgBC)zny09AnzUgu159_QsHPs zagRofyxz#`jn_^N)A5;C`eTphLl4A>Jvwj^9r$cIaLTidJiFqRvm?UqW^!x$?a6#( zs_8D|?!ujzolvuL%_9EH z(pYR^EVeKfTUW$lD~-h##$pR&v5hRYYgz0-4NkoM*zx@AR5P}p$M$~>FG6{7j29zb zjCe8P#fTT7yo~K9PR5HX@M6S^5idr(2*Zn0ycqFf#EY-Mi&MN9@nXbF#p0#b7B511 z5pUnQkdKx>pj)}SbvwKW<;5{xjCe8P#fTRpUWD?}-AbH{7gylLh!-PXjCc`-7pHhJ i;>Cy;Ux62=croI|h?k1RORX(lgz_TZ{&GDZ{pNqujqHj5 diff --git a/audio/shiba/tuning/waves/waves_config.ini b/audio/shiba/tuning/waves/waves_config.ini index e2c5bb9..6aee28d 100644 --- a/audio/shiba/tuning/waves/waves_config.ini +++ b/audio/shiba/tuning/waves/waves_config.ini @@ -27,9 +27,11 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|14 ######################################################################################################## [HAL_SUPPORTED_PRESETS] SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER -SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER +SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3 +SPEAKER_SAFE_MUSIC_THROTTLE_LITE = OM:9,SM:3 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER -SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER +SPEAKER_SAFE_MUSIC = OM:10,SM:2 +SPEAKER_SAFE_MUSIC_LITE = OM:9,SM:2 ######################################################################################################## # This defines available CONTROL configurations. Only define the CONTROL if you need it. @@ -37,7 +39,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|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE +SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE_LITE|SPEAKER_SAFE_MUSIC_LITE [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so @@ -52,10 +54,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so [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_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_MUSIC_LITE 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_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE 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/shiba/tuning/waves/waves_preset.mps b/audio/shiba/tuning/waves/waves_preset.mps index 700a2e71df88288e6d2367fb5286ece231674908..8ded11d1cf51eac82b0e5f09e712be377a6cc9f4 100644 GIT binary patch delta 9516 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 ad-Aa5;fz$$<~G(|{z&cho*0H{;r{?wV9sU$ delta 3332 zcmYL~&x_P$9LJw$Mn>DMZ8qwfV}@?VGMHbO%?sq@_r=-%5A)TJd$_N{wcifL*@YLY#}HZT72g2@Z<6oiY?&0SVH~&8{wRzx41$d)1QbW0qhA;1*Y7PJBY~R`F zEauMQF{TkJjWyC3BTZZ=X?%fctdYi=X{?bZG}2fjjWyF)BaIPhj7TG78e60>B28dP zV?-Jw(ioA(h%|vEO=mITgCLEp()a|@STjxNlE#QMMx=@7N*W{5_&`asLpVPEJ`h$exhi4jeVXktVYBbo%3CbQ!S9|TQg)x;;z#F|Y)mnKFuF``L4SDF~n#0N?f ztPvwLVpt=FHDg#Kh7mE0h#_PQ zTf{ITMqr6yL<}Qh7!kvW7=b0mMo#!3h#{*OK7kn4j1juTFd~K#G2*!r!-yC@fPEr- zvo%uZK3V;#nWtOZKAz0=;r&j1XJasz2Xk!(5-N~20vRJvTquEjfq|?M$eMwy5hyeQ zStF1&16d=G5rK>dBxE341TrE}UebEncK~$wO5GVE7II6!l=^r1?&}F&|Z<|UXj*b zk>*~p=3bHJUXj*bk>*|za<2%vSBTmxvfL{|?iC~UijaFn$h{)uUJ-Jy7_nEH2_J-e zh1PpTC%9LnwO6dMSA^UvLhcnmhrJ@?UeN*W72?Io)z24mESAA~9<2YOQ6YL%q&X_W zh!PhtD!QOi(J79Kv_?gmqhifbk>;pKYgD8;DngEmkfTD>sK|0ugd7zkMn%X`5pq<7 z92Fr)#fVW^Pxv4l6