From 9db8c953a9d99475549d3dabce243a0ffae02090 Mon Sep 17 00:00:00 2001 From: Frank Yu Date: Tue, 2 Jul 2024 10:27:00 +0000 Subject: [PATCH 1/3] Add coex display ssc configs to device. Bug: 349267882 Test: manually checked file is on device Change-Id: If7dfedc4336769645a530feb2ba7e3c86aff3488 --- device-tegu.mk | 6 ++++ radio/coex/Android.bp | 31 +++++++++++++++++++ radio/coex/display_primary_ssc_coex_table.csv | 5 +++ 3 files changed, 42 insertions(+) create mode 100644 radio/coex/Android.bp create mode 100644 radio/coex/display_primary_ssc_coex_table.csv diff --git a/device-tegu.mk b/device-tegu.mk index d9f33f2..ae07ecb 100644 --- a/device-tegu.mk +++ b/device-tegu.mk @@ -104,6 +104,12 @@ PRODUCT_COPY_FILES += \ # lhbm peak brightness delay: decided by kernel PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.primarydisplay.lhbm.frames_to_reach_peak_brightness=0 +PRODUCT_SOONG_NAMESPACES += device/google/tegu/radio/coex + +# Coex Configs +PRODUCT_PACKAGES += \ + display_primary_ssc_coex_table + # Thermal VT estimator PRODUCT_PACKAGES += \ libthermal_tflite_wrapper diff --git a/radio/coex/Android.bp b/radio/coex/Android.bp new file mode 100644 index 0000000..ff0e17f --- /dev/null +++ b/radio/coex/Android.bp @@ -0,0 +1,31 @@ +// +// Copyright (C) 2023 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +soong_namespace { +} + +package { + default_applicable_licenses: [ + "//device/google/tegu:device_google_tegu_license", + ], +} + +prebuilt_etc { + name: "display_primary_ssc_coex_table", + filename: "display_primary_ssc_coex_table.csv", + vendor: true, + src: "display_primary_ssc_coex_table.csv", + relative_install_path: "modem", +} diff --git a/radio/coex/display_primary_ssc_coex_table.csv b/radio/coex/display_primary_ssc_coex_table.csv new file mode 100644 index 0000000..c8919f0 --- /dev/null +++ b/radio/coex/display_primary_ssc_coex_table.csv @@ -0,0 +1,5 @@ +1,0 +SNH,0 +CHA,0 + +717000,723000,1 From e578df9f2cc71ccb8c879a81fd1c0932fee34f2d Mon Sep 17 00:00:00 2001 From: Nikhil Bhanu Date: Tue, 25 Jun 2024 14:30:58 -0700 Subject: [PATCH 2/3] Audio: Enabled stereo spatialization property for Tegu, added opus codec enabled spatializer offload, added CAF config files for offloaded spatializer and updated the audio tables makefile Bug: 323223919 Bug: 303920722 Bug: 348074352 Test: manual Flag: com.android.media.audio.stereo_spatialization Change-Id: Iecfd82a6285ab8e297b19e89f90ef3c018d275cb --- .../aidl_config/audio_platform_configuration.xml | 2 +- audio/tegu/audio-tables.mk | 7 +++++++ audio/tegu/tuning/spatializer/base | Bin 0 -> 3912 bytes audio/tegu/tuning/spatializer/mode_2_ch | Bin 0 -> 916 bytes audio/tegu/tuning/spatializer/mode_6_ch | Bin 0 -> 784 bytes audio/tegu/tuning/spatializer/mode_xaural | Bin 0 -> 32 bytes device-tegu.mk | 13 ++++++++----- 7 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 audio/tegu/tuning/spatializer/base create mode 100644 audio/tegu/tuning/spatializer/mode_2_ch create mode 100644 audio/tegu/tuning/spatializer/mode_6_ch create mode 100644 audio/tegu/tuning/spatializer/mode_xaural diff --git a/audio/tegu/aidl_config/audio_platform_configuration.xml b/audio/tegu/aidl_config/audio_platform_configuration.xml index 909c635..ee381be 100644 --- a/audio/tegu/aidl_config/audio_platform_configuration.xml +++ b/audio/tegu/aidl_config/audio_platform_configuration.xml @@ -31,7 +31,7 @@ - + diff --git a/audio/tegu/audio-tables.mk b/audio/tegu/audio-tables.mk index 51822f6..2a78167 100644 --- a/audio/tegu/audio-tables.mk +++ b/audio/tegu/audio-tables.mk @@ -77,3 +77,10 @@ PRODUCT_COPY_FILES += \ device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tas2572/ti_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ti_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 \ No newline at end of file diff --git a/audio/tegu/tuning/spatializer/base b/audio/tegu/tuning/spatializer/base new file mode 100644 index 0000000000000000000000000000000000000000..38cc646e1f4db548866aac2bb32c0836467df2ba GIT binary patch literal 3912 zcmai%J8l#~5Qb|X-u2sFKM(UgMU-z`PUG8p=H0HSEb>h##uY0sr9*hd>Csm|Cg5Ve0&FAxr4K8 zEB^EjPVPIpZLnMP2cs@>|8sqv^!vZ9=dg4Ae4e>|p6p@RqRKw7276swX9JY+^}Xdf zbLq(sV}hUledaZt*9HE{hVi`IFI7}u z*KpQpaq6$c(V0(}s^*OQUwk=(c_U`Rd`+4;F>g$)s_F*);`t$L9m>=t_vptRb_V@SIvPKp`Gdm08 z;&1c9W_>(j@~*j-K2$k9PjwLeMIDX2{CG6_q1Vxvc5xqu0^si(U`CvY=C2u8*R z9|!H`Z^pv-KZoS&zrE7?k9DIC4p(iY8c00W-?Y%*rlEHblJ(O#&al@wgI?ndd5yE< zwT(=RUOPMJHOAso*BKu2UPuidA0IzUc_c>PsxiF76zU?Q0i}maxBvhE literal 0 HcmV?d00001 diff --git a/audio/tegu/tuning/spatializer/mode_2_ch b/audio/tegu/tuning/spatializer/mode_2_ch new file mode 100644 index 0000000000000000000000000000000000000000..470c56cfb061951dd4509b49cfaa8391751f1c52 GIT binary patch literal 916 zcmZ`%Jxjzu5S@JMdFlmH93pDvR~sx36A^9v0k$^F`7crl7Iro#f>zquoQS1Z@BIS{ zOMifsc;cJvE`;6O!eln{Uf#UjNlHY0L`Vf?XIEov>*c9brN~``M+pVMx!$aWEwxDN zGV7AVCVQEMv6opGdr_Di*gn~djhPuP0^_q^+}p;mrTU(SLIix5oc{qUB7Cs` literal 0 HcmV?d00001 diff --git a/audio/tegu/tuning/spatializer/mode_6_ch b/audio/tegu/tuning/spatializer/mode_6_ch new file mode 100644 index 0000000000000000000000000000000000000000..94ec6356a9895665cd1dde568bbc5282d341ac0a GIT binary patch literal 784 zcmZ`%J5Iwu6deDE2u5HjMGBIzTb{4@V5o{X4 zE(X|)`Wb3SBj+C2JocV?PCmsn&F9{8@+9 cZvVX2IZ^2;rt=)?*n6*0b?0JkYTn!QA9vGakpKVy literal 0 HcmV?d00001 diff --git a/audio/tegu/tuning/spatializer/mode_xaural b/audio/tegu/tuning/spatializer/mode_xaural new file mode 100644 index 0000000000000000000000000000000000000000..b3a3a962e37c8aca8a8d1710f622c24f28343c56 GIT binary patch literal 32 dcmWe+U|^5{VipDm29d Date: Wed, 10 Jul 2024 08:47:27 +0000 Subject: [PATCH 3/3] Increase SPC thresholds based on the field data Refer to ag/28174403 and ag/28179628 Bug: 350111391 Bug: 342502377 Test: Build pass, Boot to home Flag: NONE powerhint change does not support flags Change-Id: Ie5fc7c0e7c10b070bebbdca9af212fb0c1b310d7 --- perf/powerhint-tegu.json | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/perf/powerhint-tegu.json b/perf/powerhint-tegu.json index afb05e0..2b542b6 100644 --- a/perf/powerhint-tegu.json +++ b/perf/powerhint-tegu.json @@ -701,9 +701,10 @@ "Values": [ "76", "55", - "38", - "36", "10", + "47", + "45", + "36", "30", "28" ], @@ -726,10 +727,9 @@ "Values": [ "59", "30", - "20", "2", - "18", - "15" + "23", + "20" ], "DefaultIndex": 0 }, @@ -750,8 +750,7 @@ "62", "0", "20", - "22", - "15" + "22" ], "DefaultIndex": 0 }, @@ -1769,7 +1768,7 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "36" + "Value": "47" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -1781,7 +1780,7 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "15" + "Value": "20" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -1793,7 +1792,7 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "PMU_BIG_SPC_THRESHOLD", "Duration": 0, - "Value": "15" + "Value": "20" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -1907,7 +1906,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "38" + "Value": "45" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1919,7 +1918,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "20" + "Value": "30" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2063,7 +2062,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "30" + "Value": "47" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2075,7 +2074,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "18" + "Value": "23" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2988,7 +2987,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "28" + "Value": "47" }, { "PowerHint": "CAMERA_PROJECT11", @@ -3000,7 +2999,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "18" + "Value": "23" }, { "PowerHint": "CAMERA_PROJECT11",