From 3bc0bce47d3aff79b631506e97366aeb29084e2c Mon Sep 17 00:00:00 2001 From: kuanyuhuang Date: Thu, 27 Oct 2022 10:03:03 +0000 Subject: [PATCH 1/4] BT: add sysprop to enable OPUS codec Add new system proprty persist.bluetooth.opus.enabled to indicate devices enable OPUS codec. Bug: 254609888 Test: atest net_test_stack:A2dpCodecConfigTest#init Change-Id: I1df3d6de1b4c4020fb214b4a9fe2f4fe8b347195 (cherry picked from commit 932c8178a77887712c1e9c400202663f154e4d98) Merged-In: I1df3d6de1b4c4020fb214b4a9fe2f4fe8b347195 --- bluetooth/bt_vendor_overlay.conf | 2 ++ device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index d5212db..4208da8 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -1,3 +1,5 @@ # This is BTBCM HAL overlay configuration file. BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus + +BtOpusEnabled = true diff --git a/device-oriole.mk b/device-oriole.mk index c9e69ab..37f49a0 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -267,3 +267,7 @@ PRODUCT_RESTRICT_VENDOR_FILES := false # Enable adpf cpu hint session for SurfaceFlinger PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ debug.sf.enable_adpf_cpu_hint=true + +# Bluetooth OPUS codec +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.opus.enabled=true diff --git a/device-raven.mk b/device-raven.mk index c337c13..44a81eb 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -280,3 +280,7 @@ PRODUCT_RESTRICT_VENDOR_FILES := false # Enable adpf cpu hint session for SurfaceFlinger PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ debug.sf.enable_adpf_cpu_hint=true + +# Bluetooth OPUS codec +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.opus.enabled=true From b939dc15b864eee9ecce14a559f21fe7929592dd Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 31 Oct 2022 21:42:51 +0000 Subject: [PATCH 2/4] Revert "Disable Spatial Audio [ DO NOT MERGE ]" This reverts commit 1b4f1da3ca545a100215628cf970c1eddfced142. Reason for revert: disabling was temporary Change-Id: I19b0d64c061b73ec771f78ab1346ab397de5421a (cherry picked from commit d84805f1272679d3f9eccbf1aee14aa6019f20c3) Merged-In: I19b0d64c061b73ec771f78ab1346ab397de5421a --- device-oriole.mk | 4 ++-- device-raven.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 37f49a0..812ce1a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -243,9 +243,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif -# declare use of spatial audio: disabled +# declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.spatializer_enabled=false + ro.audio.spatializer_enabled=true PRODUCT_PACKAGES += \ libspatialaudio diff --git a/device-raven.mk b/device-raven.mk index 44a81eb..e97a150 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -256,9 +256,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif -# declare use of spatial audio: disabled +# declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.spatializer_enabled=false + ro.audio.spatializer_enabled=true PRODUCT_PACKAGES += \ libspatialaudio From 458e143b3ab6d576fd4ac262fb46334c9321be35 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 11 Nov 2022 17:38:53 +0000 Subject: [PATCH 3/4] Update raven SVN to 42 Bug: 258811679 Change-Id: I110cd2d3a185fb35a5c8bf2b688e51671ac70154 (cherry picked from commit 1d38efc079d880ca07b430c4e278c34d956147ed) Merged-In: I110cd2d3a185fb35a5c8bf2b688e51671ac70154 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index e97a150..1712beb 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -180,7 +180,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=41 + ro.vendor.build.svn=42 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From c55e6c1dc9a0fce87d2ce06defe472d54d87ee72 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 11 Nov 2022 17:37:29 +0000 Subject: [PATCH 4/4] Update oriole SVN to 42 Bug: 258811679 Change-Id: I50b5fb3f693f2c918e23cf60de5ca7a50652b984 (cherry picked from commit ffd946238c33ed97df3bb665b2b5dc1f84e52671) Merged-In: I50b5fb3f693f2c918e23cf60de5ca7a50652b984 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 812ce1a..3585699 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -171,7 +171,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=41 + ro.vendor.build.svn=42 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \