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 0000000..38cc646 Binary files /dev/null and b/audio/tegu/tuning/spatializer/base differ diff --git a/audio/tegu/tuning/spatializer/mode_2_ch b/audio/tegu/tuning/spatializer/mode_2_ch new file mode 100644 index 0000000..470c56c Binary files /dev/null and b/audio/tegu/tuning/spatializer/mode_2_ch differ diff --git a/audio/tegu/tuning/spatializer/mode_6_ch b/audio/tegu/tuning/spatializer/mode_6_ch new file mode 100644 index 0000000..94ec635 Binary files /dev/null and b/audio/tegu/tuning/spatializer/mode_6_ch differ diff --git a/audio/tegu/tuning/spatializer/mode_xaural b/audio/tegu/tuning/spatializer/mode_xaural new file mode 100644 index 0000000..b3a3a96 Binary files /dev/null and b/audio/tegu/tuning/spatializer/mode_xaural differ diff --git a/device-tegu.mk b/device-tegu.mk index a81e67b..d510f66 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 @@ -119,7 +125,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.bluetooth.a2dp_offload.supported=true \ persist.bluetooth.a2dp_offload.disabled=false \ - persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac + persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ @@ -153,10 +159,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" -# Spatial Audio -PRODUCT_PACKAGES += \ - libspatialaudio \ - librondo +# declare use of spatial audio +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.spatializer_enabled=true + +# declare use of stereo spatialization +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.stereo_spatialization_enabled=true ifneq ($(USE_AUDIO_HAL_AIDL),true) # HIDL Sound Dose diff --git a/perf/powerhint-tegu.json b/perf/powerhint-tegu.json index c4d52f1..571bcba 100644 --- a/perf/powerhint-tegu.json +++ b/perf/powerhint-tegu.json @@ -702,9 +702,10 @@ "Values": [ "76", "55", - "38", - "36", "10", + "47", + "45", + "36", "30", "28" ], @@ -727,10 +728,9 @@ "Values": [ "59", "30", - "20", "2", - "18", - "15" + "23", + "20" ], "DefaultIndex": 0 }, @@ -751,8 +751,7 @@ "62", "0", "20", - "22", - "15" + "22" ], "DefaultIndex": 0 }, @@ -1776,7 +1775,7 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "36" + "Value": "47" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -1788,7 +1787,7 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "15" + "Value": "20" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -1800,7 +1799,7 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "PMU_BIG_SPC_THRESHOLD", "Duration": 0, - "Value": "15" + "Value": "20" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -1914,7 +1913,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "38" + "Value": "45" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1926,7 +1925,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "20" + "Value": "30" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2070,7 +2069,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "30" + "Value": "47" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2082,7 +2081,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "18" + "Value": "23" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2995,7 +2994,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "28" + "Value": "47" }, { "PowerHint": "CAMERA_PROJECT11", @@ -3007,7 +3006,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "18" + "Value": "23" }, { "PowerHint": "CAMERA_PROJECT11", 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