From ee08a28ff2c8f6026e2630e5973f742a2a0776a2 Mon Sep 17 00:00:00 2001 From: William Huang Date: Mon, 11 Mar 2024 02:52:42 +0000 Subject: [PATCH] Move offload spatializer config to device-specific folder. Also update the configs to http://go/txcl/33962 (commit 3c51d9c2071f9adec5dbeb3f49f83b15e92247a7). Bug: 307842941 Change-Id: I2f305441b7bc030f55318da52079a5a295e91ab1 Signed-off-by: William Huang --- audio/caiman/audio-tables.mk | 7 +++++ audio/caiman/tuning/Android.bp | 32 ++++++++++++++++++++ audio/caiman/tuning/spatializer/base | Bin 0 -> 3336 bytes audio/caiman/tuning/spatializer/mode_2_ch | Bin 0 -> 924 bytes audio/caiman/tuning/spatializer/mode_6_ch | Bin 0 -> 764 bytes audio/caiman/tuning/spatializer/mode_xaural | Bin 0 -> 32 bytes audio/komodo/audio-tables.mk | 7 +++++ audio/komodo/tuning/Android.bp | 32 ++++++++++++++++++++ audio/komodo/tuning/spatializer/base | Bin 0 -> 3336 bytes audio/komodo/tuning/spatializer/mode_2_ch | Bin 0 -> 924 bytes audio/komodo/tuning/spatializer/mode_6_ch | Bin 0 -> 764 bytes audio/komodo/tuning/spatializer/mode_xaural | Bin 0 -> 32 bytes audio/tokay/audio-tables.mk | 7 +++++ audio/tokay/tuning/Android.bp | 32 ++++++++++++++++++++ audio/tokay/tuning/spatializer/base | Bin 0 -> 3336 bytes audio/tokay/tuning/spatializer/mode_2_ch | Bin 0 -> 924 bytes audio/tokay/tuning/spatializer/mode_6_ch | Bin 0 -> 764 bytes audio/tokay/tuning/spatializer/mode_xaural | Bin 0 -> 32 bytes 18 files changed, 117 insertions(+) create mode 100644 audio/caiman/tuning/spatializer/base create mode 100644 audio/caiman/tuning/spatializer/mode_2_ch create mode 100644 audio/caiman/tuning/spatializer/mode_6_ch create mode 100644 audio/caiman/tuning/spatializer/mode_xaural create mode 100644 audio/komodo/tuning/spatializer/base create mode 100644 audio/komodo/tuning/spatializer/mode_2_ch create mode 100644 audio/komodo/tuning/spatializer/mode_6_ch create mode 100644 audio/komodo/tuning/spatializer/mode_xaural create mode 100644 audio/tokay/tuning/spatializer/base create mode 100644 audio/tokay/tuning/spatializer/mode_2_ch create mode 100644 audio/tokay/tuning/spatializer/mode_6_ch create mode 100644 audio/tokay/tuning/spatializer/mode_xaural diff --git a/audio/caiman/audio-tables.mk b/audio/caiman/audio-tables.mk index c571fec2..28f99cff 100644 --- a/audio/caiman/audio-tables.mk +++ b/audio/caiman/audio-tables.mk @@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \ device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml endif + +# Offload spatializer config +PRODUCT_PACKAGES += \ + vendor.google.whitechapel.audio.hal.effect.spatializer.base \ + vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \ + vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \ + vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural diff --git a/audio/caiman/tuning/Android.bp b/audio/caiman/tuning/Android.bp index 4dfd704d..54e6aa3a 100644 --- a/audio/caiman/tuning/Android.bp +++ b/audio/caiman/tuning/Android.bp @@ -128,3 +128,35 @@ prebuilt_etc { src: "waves/tests/test_preset.mps", soc_specific: true, } + +prebuilt_etc { + name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base", + src: "spatializer/base", + soc_specific: true, + filename_from_src: true, + relative_install_path: "spatializer", +} + +prebuilt_etc { + name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch", + src: "spatializer/mode_2_ch", + soc_specific: true, + filename_from_src: true, + relative_install_path: "spatializer", +} + +prebuilt_etc { + name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch", + src: "spatializer/mode_6_ch", + soc_specific: true, + filename_from_src: true, + relative_install_path: "spatializer", +} + +prebuilt_etc { + name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural", + src: "spatializer/mode_xaural", + soc_specific: true, + filename_from_src: true, + relative_install_path: "spatializer", +} diff --git a/audio/caiman/tuning/spatializer/base b/audio/caiman/tuning/spatializer/base new file mode 100644 index 0000000000000000000000000000000000000000..7d6a7bb07557e8680db7bb6548f6ff58352fbf48 GIT binary patch literal 3336 zcmai$J&qGW5QS^}yX%Erdw&oC5+iLwf`mAM&5y(}AcTY~I3j{$5FnB51r|61IUy1; zv3cK2m)$OA+LqeW^Ilc;tM2Nu7iKos7+7U?{rE=T%xtm6uNvIme7X_T;CJ+_Y+_)? z345UD*dA_U=+$KM>UA?|{c@W@!fjqHlg*kn+t^1|NsGsJY>;91WjjKtG@!SMCrQL2 zPR=WXmQQO%o^|eONDJTp`5y^GLmxjBMGW{Sdc^pn1N`^^ue6Hsrw4d)JJYag-l-36 z2A}D#^*TxWd#ZV}Gs&MhBj(8-p*4?_p95>KmpNbS)z>+J(r|uuzFVgj>~`2RdeV6j zw@VNDI2+>eiFy^@$j#S_{Dr8fH_zu%e0RR}_8y#R=}I+<=3RVMYpPp#)+zDiP~xet z5>I`VcycK5)K`h8zDhjj)5UXVmdc;}UTDPqai082Jo%M)@+R-1XhlJjQ2TcznD3!Qk=h;=$qByDlCap1teh z$=P{gMSb|ev$y;Hb<>}&)Pvyp?R1`;DpmWjIB;UN*h?D<)9W5KN_{N18+Z6lgi%kq z-BcJg1cuh3s+2X@ch>gxTW-~G)Rft;Tgl$@Lr0$$v1fKFTvL1Z_No26{=E76<&k|DE;fHYzR%8J zY3H*0{`dE0cP^_2Gg~)y?eE>n7AYPv*?T@a9Xi>>`?<9GS{#gC6YV))uZi3qTd#{8 z$Cmwxaj>PAL>yasbi}dcw;@Hx2BJTgsBA)lHd>^PE zY@qFfUUNr#DxjNtWj%jmuac3>Z ixR(**&P9y-6fy2f#JD37JISzC>(VY0hAlevS^opH+Y4&| literal 0 HcmV?d00001 diff --git a/audio/caiman/tuning/spatializer/mode_2_ch b/audio/caiman/tuning/spatializer/mode_2_ch new file mode 100644 index 0000000000000000000000000000000000000000..42b89999d70055091b8152c7319aa38ce164fc3f GIT binary patch literal 924 zcmZ`%yH3ME5Zw5YgkT_+Tto;#$E&qas)z(3X!rnHnp5}-w-j_Vp@9lInjl1psGUEc zpyUIn5JAlNe3EtNtaRS<&Ukk2*0G56umTxMa&bMywupvKS&STEHKZjzaMr7}pr#g< zI#ph?rq-&db!uwMm0E)SzKjYl*h-r2y&F#kqbFjseE-PCj5nno4sFbMRO;8!G+t-< zkE6+Z@r!gw11pq~bW1&Iec^+XmsFHee>R6WgMDs#$9TR4Hple61Ufue_0n`&{7cnd#?vPR zyXRMu=aFaY7{5Cpzix(LW{w|omUWPmr&DqowoVg17#|>i&!1(iww+!rO_94LkwNDX rZ`s_|X_uV)HLY_ynK*v%x$ykMEzQCISDanXZ6tAd&ts*0-X-%tL}z;j literal 0 HcmV?d00001 diff --git a/audio/caiman/tuning/spatializer/mode_6_ch b/audio/caiman/tuning/spatializer/mode_6_ch new file mode 100644 index 0000000000000000000000000000000000000000..b9e8240fae487d2da27739aee792cacd78ab8a4d GIT binary patch literal 764 zcmZ`%J8r^25FP)52#yj<6ck8FMM*C71E;@QJO7z@~kMoMHtskO(~SHWquZ#DhI}uz?4A z^kAbFHimvAh4F%|RMqLL@zikiMDFMOTWF5nY~TA@bM$Dr>$m3U)y}+ZG{(Ptmme5aehfm<>^MCe+JF_`-nLWf~mlKzHpHr*^=lbIM*?Ykf z+4B?X8uE-1!xjr88R#17GV)j6Q-zk=yq&fdJu&{~O^tNs&@bcoEb_4}u&ZxcYY3Ej VtZ|;r9Q(El$=rXTH?-dC@D9nbVmkl; literal 0 HcmV?d00001 diff --git a/audio/caiman/tuning/spatializer/mode_xaural b/audio/caiman/tuning/spatializer/mode_xaural new file mode 100644 index 0000000000000000000000000000000000000000..b3a3a962e37c8aca8a8d1710f622c24f28343c56 GIT binary patch literal 32 dcmWe+U|^5{VipDm29dUA?|{c@W@!fjqHlg*kn+t^1|NsGsJY>;91WjjKtG@!SMCrQL2 zPR=WXmQQO%o^|eONDJTp`5y^GLmxjBMGW{Sdc^pn1N`^^ue6Hsrw4d)JJYag-l-36 z2A}D#^*TxWd#ZV}Gs&MhBj(8-p*4?_p95>KmpNbS)z>+J(r|uuzFVgj>~`2RdeV6j zw@VNDI2+>eiFy^@$j#S_{Dr8fH_zu%e0RR}_8y#R=}I+<=3RVMYpPp#)+zDiP~xet z5>I`VcycK5)K`h8zDhjj)5UXVmdc;}UTDPqai082Jo%M)@+R-1XhlJjQ2TcznD3!Qk=h;=$qByDlCap1teh z$=P{gMSb|ev$y;Hb<>}&)Pvyp?R1`;DpmWjIB;UN*h?D<)9W5KN_{N18+Z6lgi%kq z-BcJg1cuh3s+2X@ch>gxTW-~G)Rft;Tgl$@Lr0$$v1fKFTvL1Z_No26{=E76<&k|DE;fHYzR%8J zY3H*0{`dE0cP^_2Gg~)y?eE>n7AYPv*?T@a9Xi>>`?<9GS{#gC6YV))uZi3qTd#{8 z$Cmwxaj>PAL>yasbi}dcw;@Hx2BJTgsBA)lHd>^PE zY@qFfUUNr#DxjNtWj%jmuac3>Z ixR(**&P9y-6fy2f#JD37JISzC>(VY0hAlevS^opH+Y4&| literal 0 HcmV?d00001 diff --git a/audio/komodo/tuning/spatializer/mode_2_ch b/audio/komodo/tuning/spatializer/mode_2_ch new file mode 100644 index 0000000000000000000000000000000000000000..42b89999d70055091b8152c7319aa38ce164fc3f GIT binary patch literal 924 zcmZ`%yH3ME5Zw5YgkT_+Tto;#$E&qas)z(3X!rnHnp5}-w-j_Vp@9lInjl1psGUEc zpyUIn5JAlNe3EtNtaRS<&Ukk2*0G56umTxMa&bMywupvKS&STEHKZjzaMr7}pr#g< zI#ph?rq-&db!uwMm0E)SzKjYl*h-r2y&F#kqbFjseE-PCj5nno4sFbMRO;8!G+t-< zkE6+Z@r!gw11pq~bW1&Iec^+XmsFHee>R6WgMDs#$9TR4Hple61Ufue_0n`&{7cnd#?vPR zyXRMu=aFaY7{5Cpzix(LW{w|omUWPmr&DqowoVg17#|>i&!1(iww+!rO_94LkwNDX rZ`s_|X_uV)HLY_ynK*v%x$ykMEzQCISDanXZ6tAd&ts*0-X-%tL}z;j literal 0 HcmV?d00001 diff --git a/audio/komodo/tuning/spatializer/mode_6_ch b/audio/komodo/tuning/spatializer/mode_6_ch new file mode 100644 index 0000000000000000000000000000000000000000..b9e8240fae487d2da27739aee792cacd78ab8a4d GIT binary patch literal 764 zcmZ`%J8r^25FP)52#yj<6ck8FMM*C71E;@QJO7z@~kMoMHtskO(~SHWquZ#DhI}uz?4A z^kAbFHimvAh4F%|RMqLL@zikiMDFMOTWF5nY~TA@bM$Dr>$m3U)y}+ZG{(Ptmme5aehfm<>^MCe+JF_`-nLWf~mlKzHpHr*^=lbIM*?Ykf z+4B?X8uE-1!xjr88R#17GV)j6Q-zk=yq&fdJu&{~O^tNs&@bcoEb_4}u&ZxcYY3Ej VtZ|;r9Q(El$=rXTH?-dC@D9nbVmkl; literal 0 HcmV?d00001 diff --git a/audio/komodo/tuning/spatializer/mode_xaural b/audio/komodo/tuning/spatializer/mode_xaural new file mode 100644 index 0000000000000000000000000000000000000000..b3a3a962e37c8aca8a8d1710f622c24f28343c56 GIT binary patch literal 32 dcmWe+U|^5{VipDm29dUA?|{c@W@!fjqHlg*kn+t^1|NsGsJY>;91WjjKtG@!SMCrQL2 zPR=WXmQQO%o^|eONDJTp`5y^GLmxjBMGW{Sdc^pn1N`^^ue6Hsrw4d)JJYag-l-36 z2A}D#^*TxWd#ZV}Gs&MhBj(8-p*4?_p95>KmpNbS)z>+J(r|uuzFVgj>~`2RdeV6j zw@VNDI2+>eiFy^@$j#S_{Dr8fH_zu%e0RR}_8y#R=}I+<=3RVMYpPp#)+zDiP~xet z5>I`VcycK5)K`h8zDhjj)5UXVmdc;}UTDPqai082Jo%M)@+R-1XhlJjQ2TcznD3!Qk=h;=$qByDlCap1teh z$=P{gMSb|ev$y;Hb<>}&)Pvyp?R1`;DpmWjIB;UN*h?D<)9W5KN_{N18+Z6lgi%kq z-BcJg1cuh3s+2X@ch>gxTW-~G)Rft;Tgl$@Lr0$$v1fKFTvL1Z_No26{=E76<&k|DE;fHYzR%8J zY3H*0{`dE0cP^_2Gg~)y?eE>n7AYPv*?T@a9Xi>>`?<9GS{#gC6YV))uZi3qTd#{8 z$Cmwxaj>PAL>yasbi}dcw;@Hx2BJTgsBA)lHd>^PE zY@qFfUUNr#DxjNtWj%jmuac3>Z ixR(**&P9y-6fy2f#JD37JISzC>(VY0hAlevS^opH+Y4&| literal 0 HcmV?d00001 diff --git a/audio/tokay/tuning/spatializer/mode_2_ch b/audio/tokay/tuning/spatializer/mode_2_ch new file mode 100644 index 0000000000000000000000000000000000000000..42b89999d70055091b8152c7319aa38ce164fc3f GIT binary patch literal 924 zcmZ`%yH3ME5Zw5YgkT_+Tto;#$E&qas)z(3X!rnHnp5}-w-j_Vp@9lInjl1psGUEc zpyUIn5JAlNe3EtNtaRS<&Ukk2*0G56umTxMa&bMywupvKS&STEHKZjzaMr7}pr#g< zI#ph?rq-&db!uwMm0E)SzKjYl*h-r2y&F#kqbFjseE-PCj5nno4sFbMRO;8!G+t-< zkE6+Z@r!gw11pq~bW1&Iec^+XmsFHee>R6WgMDs#$9TR4Hple61Ufue_0n`&{7cnd#?vPR zyXRMu=aFaY7{5Cpzix(LW{w|omUWPmr&DqowoVg17#|>i&!1(iww+!rO_94LkwNDX rZ`s_|X_uV)HLY_ynK*v%x$ykMEzQCISDanXZ6tAd&ts*0-X-%tL}z;j literal 0 HcmV?d00001 diff --git a/audio/tokay/tuning/spatializer/mode_6_ch b/audio/tokay/tuning/spatializer/mode_6_ch new file mode 100644 index 0000000000000000000000000000000000000000..b9e8240fae487d2da27739aee792cacd78ab8a4d GIT binary patch literal 764 zcmZ`%J8r^25FP)52#yj<6ck8FMM*C71E;@QJO7z@~kMoMHtskO(~SHWquZ#DhI}uz?4A z^kAbFHimvAh4F%|RMqLL@zikiMDFMOTWF5nY~TA@bM$Dr>$m3U)y}+ZG{(Ptmme5aehfm<>^MCe+JF_`-nLWf~mlKzHpHr*^=lbIM*?Ykf z+4B?X8uE-1!xjr88R#17GV)j6Q-zk=yq&fdJu&{~O^tNs&@bcoEb_4}u&ZxcYY3Ej VtZ|;r9Q(El$=rXTH?-dC@D9nbVmkl; literal 0 HcmV?d00001 diff --git a/audio/tokay/tuning/spatializer/mode_xaural b/audio/tokay/tuning/spatializer/mode_xaural new file mode 100644 index 0000000000000000000000000000000000000000..b3a3a962e37c8aca8a8d1710f622c24f28343c56 GIT binary patch literal 32 dcmWe+U|^5{VipDm29d