From c727cf6fc547e8ec0e85dd7d4104f940bb775690 Mon Sep 17 00:00:00 2001 From: leonardian Date: Fri, 17 May 2024 12:07:42 +0000 Subject: [PATCH 01/74] conf: Enable access for braking time sysfs nodes Sysfs nodes: - braking_time_bank - braking_time_index - braking_time_ms Bug: 325121485 Test: Open sysfs nodes successfully during HAL init Change-Id: I88f59ca68028ea7fe1c2a7e61c6bf61ab647169b Signed-off-by: leonardian --- conf/init.husky.rc | 3 +++ conf/init.shiba.rc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/conf/init.husky.rc b/conf/init.husky.rc index 17b081e..ffd9bd8 100644 --- a/conf/init.husky.rc +++ b/conf/init.husky.rc @@ -68,6 +68,9 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/0-0043/default/num_waves chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_bank + chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_index + chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_ms chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us diff --git a/conf/init.shiba.rc b/conf/init.shiba.rc index 8c88141..b30f54f 100644 --- a/conf/init.shiba.rc +++ b/conf/init.shiba.rc @@ -62,6 +62,9 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state chown system system /sys/bus/i2c/devices/0-0043/default/num_waves + chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_bank + chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_index + chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_ms chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable From 63ed988085638e223edd71a172282dfd213aa3e8 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 23 May 2024 21:44:55 +0000 Subject: [PATCH 02/74] Remove L9S_GNSS_CORE from thermal json Remove L9S_GNSS_CORE because the accuracy problem Bug: 331852404 Test: boot to home Change-Id: Ic4d4285ae053367893e5076685550406102f1a62 --- thermal/thermal_info_config_charge_husky.json | 4 ++-- thermal/thermal_info_config_charge_shiba.json | 4 ++-- thermal/thermal_info_config_husky.json | 4 ++-- thermal/thermal_info_config_shiba.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index 3751093..6212234 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -337,8 +337,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json index 8e3ffbd..539bcef 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -370,8 +370,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index b08761a..673cb67 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -1142,8 +1142,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index bc6bdf1..995ee2f 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -1175,8 +1175,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } From dbbeb5592d7bcd71e20e50422375e7dbe4e3612d Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 30 May 2024 00:07:15 +0000 Subject: [PATCH 03/74] Update shiba SVN to 28 Bug: 342381152 Change-Id: Ib715c678925f017ef61b90b5331a705745ccd7ef --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index e83d420..1cdcde1 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -379,7 +379,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 1fd7be6ff6a4b00b907c7ef5096869938075e882 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 30 May 2024 00:09:10 +0000 Subject: [PATCH 04/74] Update husky SVN to 28 Bug: 342381152 Change-Id: Iebe683d60093eecbf7aa8fb417c390e5180abfc9 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index ec1c18b..b907d73 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -405,7 +405,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From a7d44dbb505092e6b99126ff5feb96cce9b8404c Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 31 May 2024 18:20:52 +0000 Subject: [PATCH 05/74] Update husky SVN to 29 Bug: 342381152 Change-Id: I984a575909fd74ba78148bf39b5a109ecbf7bc3f --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index b907d73..979a85e 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -405,7 +405,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From d650a1559a58ababa3feaaea2a44e4b4f81f829a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 31 May 2024 18:22:16 +0000 Subject: [PATCH 06/74] Update shiba SVN to 29 Bug: 342381152 Change-Id: Ie294dbfad34544b20386d019edf8d24819aa1f6d --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 1cdcde1..dd66319 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -379,7 +379,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From b085ae1f72b6821c4f6e2bbf0e741148775346d8 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:08:32 +0000 Subject: [PATCH 07/74] Update shiba SVN to 30 Bug: 342381152 Change-Id: I2ef29057958ba6e31c76973de70d69577c1befe5 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index dd66319..e071016 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -379,7 +379,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 98ed4cdd4eb4b4e8deb094478a8a351bea7a6cdc Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:10:47 +0000 Subject: [PATCH 08/74] Update shiba SVN to 31 Bug: 342381152 Change-Id: I2f0f9681455968cdaed4a74d3a77c0b2de1ba14b --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index e071016..0460cb1 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -379,7 +379,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=30 + ro.vendor.build.svn=31 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From d3e5bfd7a40cb6652407777caadb206c07171cf8 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:13:33 +0000 Subject: [PATCH 09/74] Update shiba SVN to 32 Bug: 342381152 Change-Id: I18527bb9a4358c14b2e99646670f0ab2da8173f0 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 0460cb1..321699c 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -379,7 +379,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From a7b24379b54da71b59da2c80dc3ede5ce83beafd Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:15:27 +0000 Subject: [PATCH 10/74] Update husky SVN to 30 Bug: 342381152 Change-Id: Icdbc5cd31dbca584589f703c16aa18698f7de294 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 979a85e..316430b 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -405,7 +405,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 810570db667f583164ab6af56df0ecbe9756b1d6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:17:07 +0000 Subject: [PATCH 11/74] Update husky SVN to 31 Bug: 342381152 Change-Id: I2bdfbbed0dff3c3c093dd46200f2d8ce15c28652 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 316430b..52ba5b0 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -405,7 +405,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=30 + ro.vendor.build.svn=31 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From fe6c3b8adfa981b440aaf8250b633ca5db4de643 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:18:42 +0000 Subject: [PATCH 12/74] Update husky SVN to 32 Bug: 342381152 Change-Id: Icb9de546d095ed4d97e52cc32c1b034856ccd6fb --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 52ba5b0..88db0f7 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -405,7 +405,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 5011c28eab80d3fbd2b6f9be7f2d6d51a4976aab Mon Sep 17 00:00:00 2001 From: chenkris Date: Fri, 21 Jun 2024 04:04:48 +0000 Subject: [PATCH 13/74] =?UTF-8?q?Build=20g7=5Ftrusty=5Fnext=20for=20?= =?UTF-8?q?=E2=80=9Cnext=E2=80=9D=20configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: 348542941 Test: build Change-Id: Ie4c8e606980580189d63fb4764428b6aacdefdaa --- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index aad692e..eb94b55 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -322,7 +322,11 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL +ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION))) +GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next +else GOODIX_CONFIG_BUILD_VERSION := g7_trusty +endif APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) diff --git a/device-shiba.mk b/device-shiba.mk index 4965a07..23a587a 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -305,7 +305,11 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL +ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION))) +GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next +else GOODIX_CONFIG_BUILD_VERSION := g7_trusty +endif APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) From 357cc1f618589e8d6664dbee856061428c221ebc Mon Sep 17 00:00:00 2001 From: chenkris Date: Mon, 24 Jun 2024 11:24:07 +0000 Subject: [PATCH 14/74] =?UTF-8?q?Revert=20"Build=20g7=5Ftrusty=5Fnext=20fo?= =?UTF-8?q?r=20=E2=80=9Cnext=E2=80=9D=20configuration"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5011c28eab80d3fbd2b6f9be7f2d6d51a4976aab. Bug: 348542941 Test: build Change-Id: I26464d764de6964bc66126ef152ffcf068b8ce1c --- device-husky.mk | 4 ---- device-shiba.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index eb94b55..aad692e 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -322,11 +322,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL -ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION))) -GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next -else GOODIX_CONFIG_BUILD_VERSION := g7_trusty -endif APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) diff --git a/device-shiba.mk b/device-shiba.mk index 23a587a..4965a07 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -305,11 +305,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL -ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION))) -GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next -else GOODIX_CONFIG_BUILD_VERSION := g7_trusty -endif APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) From fa60355a21dc6bdc9fc38a7651f33115b152bd50 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 25 Jun 2024 05:36:24 +0000 Subject: [PATCH 15/74] gps: Set configuration by kernel version Bug: 258364350 Test: Verification at b/258364350. Test: Function verification at b/258364350. Test: Compile and verify the configuration is correct. Change-Id: I7d6521bef3605dc725c9a9e34f27217ccae42d4e --- device-husky.mk | 21 +++++-- device-shiba.mk | 21 +++++-- location/gps.6.1.xml.hk3 | 108 ++++++++++++++++++++++++++++++++++ location/gps.6.1.xml.sb3 | 108 ++++++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.hk3 | 107 +++++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.sb3 | 107 +++++++++++++++++++++++++++++++++ location/lhd.conf | 1 + location/lhd_user.conf | 1 + 8 files changed, 466 insertions(+), 8 deletions(-) create mode 100644 location/gps.6.1.xml.hk3 create mode 100644 location/gps.6.1.xml.sb3 create mode 100644 location/gps_user.6.1.xml.hk3 create mode 100644 location/gps_user.6.1.xml.sb3 diff --git a/device-husky.mk b/device-husky.mk index eb94b55..ee3abc2 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -304,16 +304,29 @@ include device/google/gs-common/gps/brcm/device.mk PRODUCT_COPY_FILES += \ device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer +# Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) + PRODUCT_COPY_FILES += \ + device/google/shusky/location/gps.6.1.xml.hk3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else PRODUCT_COPY_FILES += \ - device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \ device/google/shusky/location/gps.xml.hk3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + PRODUCT_COPY_FILES += \ + device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) + PRODUCT_COPY_FILES += \ + device/google/shusky/location/gps_user.6.1.xml.hk3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else PRODUCT_COPY_FILES += \ - device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \ device/google/shusky/location/gps_user.xml.hk3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Set zram size diff --git a/device-shiba.mk b/device-shiba.mk index 23a587a..a026d4d 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -287,16 +287,29 @@ include device/google/gs-common/gps/brcm/device.mk PRODUCT_COPY_FILES += \ device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer +# Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) + PRODUCT_COPY_FILES += \ + device/google/shusky/location/gps.6.1.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else PRODUCT_COPY_FILES += \ - device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \ device/google/shusky/location/gps.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + PRODUCT_COPY_FILES += \ + device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) + PRODUCT_COPY_FILES += \ + device/google/shusky/location/gps_user.6.1.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else PRODUCT_COPY_FILES += \ - device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \ device/google/shusky/location/gps_user.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Set zram size diff --git a/location/gps.6.1.xml.hk3 b/location/gps.6.1.xml.hk3 new file mode 100644 index 0000000..beba2bb --- /dev/null +++ b/location/gps.6.1.xml.hk3 @@ -0,0 +1,108 @@ + + + + + + + + + + diff --git a/location/gps.6.1.xml.sb3 b/location/gps.6.1.xml.sb3 new file mode 100644 index 0000000..fe5065b --- /dev/null +++ b/location/gps.6.1.xml.sb3 @@ -0,0 +1,108 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.hk3 b/location/gps_user.6.1.xml.hk3 new file mode 100644 index 0000000..a6ddbce --- /dev/null +++ b/location/gps_user.6.1.xml.hk3 @@ -0,0 +1,107 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.sb3 b/location/gps_user.6.1.xml.sb3 new file mode 100644 index 0000000..4248a7b --- /dev/null +++ b/location/gps_user.6.1.xml.sb3 @@ -0,0 +1,107 @@ + + + + + + + + + + diff --git a/location/lhd.conf b/location/lhd.conf index c430b93..a0183a4 100644 --- a/location/lhd.conf +++ b/location/lhd.conf @@ -31,3 +31,4 @@ SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf SkipSensorWakeLock=true LoggerWakeLockEnable=false +PpsEnable=true diff --git a/location/lhd_user.conf b/location/lhd_user.conf index 73e03bc..d861fec 100644 --- a/location/lhd_user.conf +++ b/location/lhd_user.conf @@ -29,3 +29,4 @@ TrafficLogEnabled=false SkipSensorWakeLock=true LoggerWakeLockEnable=false +PpsEnable=true From 9c0b973e012e8a0de9b3094a573b2eeff93f0743 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 3 Apr 2024 18:57:52 +0000 Subject: [PATCH 16/74] shusky: Use build_flags for SVN Flag: build.RELEASE_SVN_HUSKY Flag: build.RELEASE_SVN_SHIBA Bug: 332726030 Change-Id: I289ffb153c91536c3d505dba3efe6b9096dbad50 --- device-husky.mk | 9 ++++++++- device-shiba.mk | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index aad692e..0c180c3 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -395,8 +395,15 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.pm.activetimeout=5 # Increment the SVN for any official public releases +ifdef RELEASE_SVN_HUSKY +TARGET_SVN ?= $(RELEASE_SVN_HUSKY) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 32 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=32 + ro.vendor.build.svn=$(TARGET_SVN) # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-shiba.mk b/device-shiba.mk index 4965a07..942ec14 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -372,8 +372,15 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.pm.activetimeout=5 # Increment the SVN for any official public releases +ifdef RELEASE_SVN_SHIBA +TARGET_SVN ?= $(RELEASE_SVN_SHIBA) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 32 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=32 + ro.vendor.build.svn=$(TARGET_SVN) # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 4b81f5752eca9db2dfcaa1cf449ba75495391cee Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Fri, 28 Jun 2024 10:45:09 -0700 Subject: [PATCH 17/74] Add DTBO partition to shiba/husky's dev option OTA Some 16KB kernels have a different device tree(stored on DTBO partition). Hence add DTBO partition to dev option OTA Test: th Bug: 349590107 Change-Id: I1e54dd18a8bbcb82b1fc3b07b29f229b3d5366e5 --- BoardConfig-shusky-common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/BoardConfig-shusky-common.mk b/BoardConfig-shusky-common.mk index f2ede26..ee58c62 100644 --- a/BoardConfig-shusky-common.mk +++ b/BoardConfig-shusky-common.mk @@ -23,6 +23,7 @@ BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_kernel_boot BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/system_dlkm.modules.load) BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_dlkm.modules.load) BOARD_KERNEL_MODULES_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(TARGET_KERNEL_DIR_16K)/$(notdir $(module))) +BOARD_PREBUILT_DTBOIMAGE_16KB := $(TARGET_KERNEL_DIR_16K)/dtbo.img # Shusky targets use exynos-bcm_dbg.ko module instead of bcm_dbg.ko. BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K)) From 73c64fff2104a5accaec04816d692e6a5159f3e8 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Wed, 26 Jun 2024 21:28:09 -0700 Subject: [PATCH 18/74] 16kb: Use PRODUCT_BOOTS_16K to select the kernel and fs The build flag PRODUCT_BOOTS_16K will be used to select whether the shusky devices boot with 16kb kernel or 4kb kernel. Bug: 346868433 Test: Built Pixel 8 targets $ source build/envsetup.sh $ lunch husky_pgagnostic-trunk_staging-userdebug $ get_build_var DEVICE_PAGE_AGNOSTIC $ get_build_var TARGET_KERNEL_DIR device/google/shusky-kernels/6.1/trunk-12010727/16kb $ get_build_var TARGET_BOARD_KERNEL_HEADERS device/google/shusky-kernels/6.1/trunk-12010727/kernel-headers $ get_build_var PRODUCT_BOOTS_16K true $ get_build_var TARGET_RW_FILE_SYSTEM_TYPE ext4 $ get_build_var TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE ext4 Flag: EXEMPT bugfix Change-Id: Ia75c7f8cfca6d651777c730a3f86715a0991fbec --- device-husky.mk | 4 +--- device-shiba.mk | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index aad692e..93d9742 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -31,9 +31,7 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),) include device/google/shusky/uwb/uwb_calibration.mk endif -DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false) - -ifeq ($(DEVICE_PAGE_AGNOSTIC),true) +ifeq ($(PRODUCT_BOOTS_16K),true) TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb TARGET_RW_FILE_SYSTEM_TYPE := ext4 diff --git a/device-shiba.mk b/device-shiba.mk index 4965a07..a2c19b9 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -24,9 +24,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers LOCAL_PATH := device/google/shusky -DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false) - -ifeq ($(DEVICE_PAGE_AGNOSTIC),true) +ifeq ($(PRODUCT_BOOTS_16K),true) TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb TARGET_RW_FILE_SYSTEM_TYPE := ext4 From d3ad2f99ce7c7b9957fda694d102b4d4e7a038cb Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Tue, 2 Jul 2024 11:13:44 -0700 Subject: [PATCH 19/74] 16kb: Set 16kb TARGET_ vars in BoardConfig files and targets TARGET_ build variables MUST NOT be set up in device* files. In the device* files, the PRODUCT_ variables are not defined properly and only after the build system finishes parsing all the product files, we can set up TARGET_ vars based on PRODUCT_ vars. During the parsing of the BoardConfig files, the PRODUCT_ vars are defined and their values can not be changed. Test: Built and tested husky-next and husky-pgagnostic targets $ source build/envsetup.sh $ lunch husky-trunk_staging-userdebug $ get_build_var PRODUCT_16K_DEVELOPER_OPTION true $ get_build_var TARGET_BOOTS_16K $ get_build_var TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE $ get_build_var TARGET_KERNEL_DIR device/google/shusky-kernels/6.1/trunk-12034122 $ get_build_var BOARD_KERNEL_PATH_16K device/google/shusky-kernels/6.1/trunk-12034122/16kb/Image.lz4 $ get_build_var TARGET_KERNEL_DIR_16K device/google/shusky-kernels/6.1/trunk-12034122/16kb $ get_build_var ADDITIONAL_PRODUCT_PROPERTIES | grep 16k ro.product.build.16k_page.enabled=true $ get_build_var PRODUCT_COPY_FILES | grep efs device/google/zuma/conf/init.efs.16k.rc:vendor/etc/init/init.efs.rc $ get_build_var PRODUCT_SOONG_NAMESPACES | grep insmod device/google/gs-common/insmod/4k Bug: 350529323 Bug: 346868433 Flag: EXEMPT bugfix Change-Id: Ic1da7f21b696f1659ef7d7b0b7089c3d2c03103e --- BoardConfig-shusky-common.mk | 6 +++++- device-husky.mk | 6 +----- device-shiba.mk | 6 +----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/BoardConfig-shusky-common.mk b/BoardConfig-shusky-common.mk index f2ede26..90ceb83 100644 --- a/BoardConfig-shusky-common.mk +++ b/BoardConfig-shusky-common.mk @@ -14,7 +14,11 @@ # limitations under the License. # -ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true) +ifeq ($(TARGET_BOOTS_16K),true) +# Configures the 16kb kernel directory. +TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb + +else ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true) # Configures the 16kb kernel and modules for OTA updates. TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4 diff --git a/device-husky.mk b/device-husky.mk index 50a1582..a9f860d 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -31,11 +31,7 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),) include device/google/shusky/uwb/uwb_calibration.mk endif -ifeq ($(PRODUCT_BOOTS_16K),true) -TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb -TARGET_RW_FILE_SYSTEM_TYPE := ext4 -else +ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION) endif diff --git a/device-shiba.mk b/device-shiba.mk index f96a9a1..d178c67 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -24,11 +24,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers LOCAL_PATH := device/google/shusky -ifeq ($(PRODUCT_BOOTS_16K),true) -TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb -TARGET_RW_FILE_SYSTEM_TYPE := ext4 -else +ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION) endif From 5d7618d722f3478055669e19cba47bc6709dc0c9 Mon Sep 17 00:00:00 2001 From: James Eidson Date: Wed, 3 Jul 2024 20:17:02 +0000 Subject: [PATCH 20/74] [uwb] Support multicast list update ntf v2 on husky Bug: 350781526 Test: atest CtsUwbTestCases:android.uwb.cts.UwbManagerTest#testFiraRangingSessionAddRemoveControlee Change-Id: Ibf13890c991e84fb7ae69d38c31d9f3285b7c25f --- husky/rro_overlays/UwbOverlay/res/values/config.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/husky/rro_overlays/UwbOverlay/res/values/config.xml b/husky/rro_overlays/UwbOverlay/res/values/config.xml index bf8d264..622018d 100644 --- a/husky/rro_overlays/UwbOverlay/res/values/config.xml +++ b/husky/rro_overlays/UwbOverlay/res/values/config.xml @@ -30,4 +30,8 @@ * When previously foreground 3p apps moves to background, sessions are not terminated --> true + + + true From 2502760f89a53d6ec74e26f1a781f2387a7b0ab2 Mon Sep 17 00:00:00 2001 From: Vilas Bhat Date: Mon, 1 Jul 2024 21:32:35 +0000 Subject: [PATCH 21/74] 16k: Move BoardConfig-shusky-common.mk to device/google/zuma/BoardConfig-16k-common.mk The makefile logic in this file is identical to the logic required for akita-trunk_staging-userdebug. Hence, this logic is moved to device/google/zuma/BoardConfig-16k-common.mk to avoid duplicating the file for akita. Bug: 349877551 Test: $ lunch shiba-trunk_staging-userdebug $ get_build_var TARGET_KERNEL_DIR_16K device/google/shusky-kernels/5.15/trunk-12022168/16kb $ get_build_var BOARD_KERNEL_PATH_16K device/google/shusky-kernels/5.15/trunk-12022168/16kb/Image.lz4 $ get_build_var BOARD_16K_OTA_USE_INCREMENTAL true $ get_build_var BOARD_16K_OTA_MOVE_VENDOR true Flag: EXEMPT bugfix Change-Id: I80cb3e9f4c4a1609ca668af554d930edb3b4c5a0 --- BoardConfig-shusky-common.mk | 38 ------------------------------------ husky/BoardConfig.mk | 1 - shiba/BoardConfig.mk | 1 - 3 files changed, 40 deletions(-) delete mode 100644 BoardConfig-shusky-common.mk diff --git a/BoardConfig-shusky-common.mk b/BoardConfig-shusky-common.mk deleted file mode 100644 index e311448..0000000 --- a/BoardConfig-shusky-common.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (C) 2024 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. -# - -ifeq ($(TARGET_BOOTS_16K),true) -# Configures the 16kb kernel directory. -TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb - -else ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true) -# Configures the 16kb kernel and modules for OTA updates. -TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb -BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4 - -BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_kernel_boot.modules.load) -BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/system_dlkm.modules.load) -BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_dlkm.modules.load) -BOARD_KERNEL_MODULES_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(TARGET_KERNEL_DIR_16K)/$(notdir $(module))) -BOARD_PREBUILT_DTBOIMAGE_16KB := $(TARGET_KERNEL_DIR_16K)/dtbo.img - -# Shusky targets use exynos-bcm_dbg.ko module instead of bcm_dbg.ko. -BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module))) - -BOARD_16K_OTA_USE_INCREMENTAL := true -BOARD_16K_OTA_MOVE_VENDOR := true -endif \ No newline at end of file diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 31915d2..f387ff9 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -47,7 +47,6 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on WIFI_FEATURE_REAR_CAMERA_SAR := true $(call soong_config_set,wifi,feature_rear_camera_sar,$(WIFI_FEATURE_REAR_CAMERA_SAR)) -include device/google/shusky/BoardConfig-shusky-common.mk include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 2368ec1..8a5fb4b 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -43,7 +43,6 @@ USES_DEVICE_GOOGLE_SHUSKY := true BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_KERNEL_CMDLINE += disable_dma32=on -include device/google/shusky/BoardConfig-shusky-common.mk include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk From 18bcad509dcba90fbe2765597759dda9eedf3bb4 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Tue, 9 Jul 2024 07:30:36 +0000 Subject: [PATCH 22/74] add device id Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I99de1f14cb419d335eea45d3c857d018c331ad83 --- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index a9f860d..e903c5f 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -480,3 +480,7 @@ endif PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true + +# Bluetooth device id +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.device_id.product_id=20493 diff --git a/device-shiba.mk b/device-shiba.mk index d178c67..c227a8a 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -449,3 +449,7 @@ endif PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true + +# Bluetooth device id +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.device_id.product_id=20492 From d6240b116e09dec2c466e49b3ec395a018d26597 Mon Sep 17 00:00:00 2001 From: lukechang Date: Mon, 3 Jun 2024 12:58:44 +0000 Subject: [PATCH 23/74] powerhint: adjust cpd target residency when interaction Modify default BC (husky) / BC/MC(shiba) CPD target residency to 10ms. Increase to 750ms during interaction. Bug: 283233731 Bug: 350508026 Flag: EXEMPT bugfix Test: power & perf cuj test Change-Id: I02ef4cf1174f6b49cbc4734257d9dbe43b74b86e Signed-off-by: lukechang --- perf/powerhint-husky.json | 13 +++++++++---- perf/powerhint-shiba.json | 23 ++++++++++++++--------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 1c29123..39ab9ad 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -238,7 +238,7 @@ "750000", "10000" ], - "DefaultIndex": 0, + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -1252,10 +1252,15 @@ "Value": "DISPLAY_UPDATE_IMMINENT" }, { - "PowerHint": "DISPLAY_INACTIVE", + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION" + }, + { + "PowerHint": "INTERACTION", "Node": "BigClusterPowerDownTargetResidency", - "Duration": 0, - "Value": "10000" + "Duration": 2000, + "Value": "750000" }, { "PowerHint": "DISPLAY_INACTIVE", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index fb000e1..0c2704e 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -228,7 +228,7 @@ "750000", "10000" ], - "DefaultIndex": 0, + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -238,7 +238,7 @@ "750000", "10000" ], - "DefaultIndex": 0, + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -1258,16 +1258,21 @@ "Value": "DISPLAY_UPDATE_IMMINENT" }, { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "BigClusterPowerDownTargetResidency", - "Duration": 0, - "Value": "10000" + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION" }, { - "PowerHint": "DISPLAY_INACTIVE", + "PowerHint": "INTERACTION", + "Node": "BigClusterPowerDownTargetResidency", + "Duration": 2000, + "Value": "750000" + }, + { + "PowerHint": "INTERACTION", "Node": "MidClusterPowerDownTargetResidency", - "Duration": 0, - "Value": "10000" + "Duration": 2000, + "Value": "750000" }, { "PowerHint": "DISPLAY_INACTIVE", From 37b036a0ed8b956f77589654c3748ee6fbacedd1 Mon Sep 17 00:00:00 2001 From: Hana Huang Date: Fri, 12 Jul 2024 05:57:06 +0000 Subject: [PATCH 24/74] Wifi: Disable config_wifiEnableStaIndoorChannelForPeerNetwork Bug: 351981809 Bug: 352658713 Test: AU drop/IFS/RvR/CTS/VTS/Manual Test, JP SAP indoor channel test Change-Id: If2d46e2bbd7612e6cc6f80bc74c7870dea17e08d Signed-off-by: Hana Huang --- rro_overlays/WifiOverlay/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index 61a2e7f..6519607 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -152,7 +152,7 @@ - true + false true From d9fa747d2582f885232423a464786d838d11b81a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:21:17 +0000 Subject: [PATCH 25/74] Update shiba SVN to 33 Bug: 352170103 Change-Id: I4ad3b7e298cf6ec12e2cfc8873a24492fd5c25df Flag: EXEMPT bugfix --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 06e190d..1543f85 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -383,7 +383,7 @@ ifdef RELEASE_SVN_SHIBA TARGET_SVN ?= $(RELEASE_SVN_SHIBA) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 32 +TARGET_SVN ?= 33 endif PRODUCT_VENDOR_PROPERTIES += \ From a1e3e6cce330644fffac42cc04e7e607be88efa2 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:37:46 +0000 Subject: [PATCH 26/74] Update shiba SVN to 34 Bug: 352170103 Change-Id: I9c7a9f6da772ecee70b9022aa29e8a3ad0d130d4 Flag: EXEMPT bugfix --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 1543f85..b50b027 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -383,7 +383,7 @@ ifdef RELEASE_SVN_SHIBA TARGET_SVN ?= $(RELEASE_SVN_SHIBA) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 33 +TARGET_SVN ?= 34 endif PRODUCT_VENDOR_PROPERTIES += \ From 633317c02cf441e3fc03151ed15ecb72bd29fd98 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:39:27 +0000 Subject: [PATCH 27/74] Update shiba SVN to 35 Bug: 352170103 Change-Id: Ib5c55167cdc0bbae64e48adb6778c445a38e5cc1 Flag: EXEMPT bugfix --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index b50b027..a6b6093 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -383,7 +383,7 @@ ifdef RELEASE_SVN_SHIBA TARGET_SVN ?= $(RELEASE_SVN_SHIBA) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 34 +TARGET_SVN ?= 35 endif PRODUCT_VENDOR_PROPERTIES += \ From 4b4f16c266ad592ed13c50202ce690c939410cdd Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:41:20 +0000 Subject: [PATCH 28/74] Update husky SVN to 33 Bug: 352170103 Change-Id: I9beeef1b118a8d8a05ea14072e211d2f25eaf164 Flag: EXEMPT bugfix --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index be6f0ee..b028444 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -406,7 +406,7 @@ ifdef RELEASE_SVN_HUSKY TARGET_SVN ?= $(RELEASE_SVN_HUSKY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 32 +TARGET_SVN ?= 33 endif PRODUCT_VENDOR_PROPERTIES += \ From c473353c4c58c6d178bedfec15d4d53595b941d5 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:43:18 +0000 Subject: [PATCH 29/74] Update husky SVN to 34 Bug: 352170103 Change-Id: Ieb8ec0e93b463e95787a3ceed0ed4cddf78b262a Flag: EXEMPT bugfix --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index b028444..0af4537 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -406,7 +406,7 @@ ifdef RELEASE_SVN_HUSKY TARGET_SVN ?= $(RELEASE_SVN_HUSKY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 33 +TARGET_SVN ?= 34 endif PRODUCT_VENDOR_PROPERTIES += \ From f5bb7a3f5605d94f482aeb7a50b842eb2e9a1942 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:46:05 +0000 Subject: [PATCH 30/74] Update husky SVN to 35 Bug: 352170103 Change-Id: I661546ae0ab104021936acd109e08de2a64a1b1c Flag: EXEMPT bugfix --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 0af4537..1c1e3b0 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -406,7 +406,7 @@ ifdef RELEASE_SVN_HUSKY TARGET_SVN ?= $(RELEASE_SVN_HUSKY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 34 +TARGET_SVN ?= 35 endif PRODUCT_VENDOR_PROPERTIES += \ From 2e7ff7dc8dd483f32e93ecb369723b93df276c88 Mon Sep 17 00:00:00 2001 From: Bao Do Date: Thu, 18 Jul 2024 13:35:37 +0800 Subject: [PATCH 31/74] Set system property for LEA multi-codec for P23 projects Bug: 306225778 Test: Check system property value Flag: NONE system property change only Change-Id: I2450176a6b975d9e9a6bc228334c2b0a7c76706d --- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index be6f0ee..dd708ec 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -491,3 +491,7 @@ PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true # Bluetooth device id PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=20493 + +# Set support for LEA multicodec +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.core.le_audio.codec_extension_aidl.enabled=true diff --git a/device-shiba.mk b/device-shiba.mk index 06e190d..58407d3 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -460,3 +460,7 @@ PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true # Bluetooth device id PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=20492 + +# Set support for LEA multicodec +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.core.le_audio.codec_extension_aidl.enabled=true From 7e7688125ff4452e8fb2144e59559eaabf121ed4 Mon Sep 17 00:00:00 2001 From: Kyle Hsiao Date: Thu, 18 Jul 2024 11:14:38 +0000 Subject: [PATCH 32/74] Update antenna position coordinates Bug: 353895373 Test: manual Flag: EXEMPT bugfix Change-Id: I6c3c4aa4f6cd517ff3467eb977f1bac46c451aca --- husky/rro_overlays/NfcOverlay/res/values/config.xml | 2 +- shiba/rro_overlays/NfcOverlay/res/values/config.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/husky/rro_overlays/NfcOverlay/res/values/config.xml b/husky/rro_overlays/NfcOverlay/res/values/config.xml index f396738..c480fff 100644 --- a/husky/rro_overlays/NfcOverlay/res/values/config.xml +++ b/husky/rro_overlays/NfcOverlay/res/values/config.xml @@ -30,7 +30,7 @@ 37 - 103 + 55 true diff --git a/shiba/rro_overlays/NfcOverlay/res/values/config.xml b/shiba/rro_overlays/NfcOverlay/res/values/config.xml index a3497bf..8b56721 100644 --- a/shiba/rro_overlays/NfcOverlay/res/values/config.xml +++ b/shiba/rro_overlays/NfcOverlay/res/values/config.xml @@ -25,7 +25,7 @@ 34 - 97 + 48 true true From df6fafe03aa979262be86054a6ab8287b6272792 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 25 Jul 2024 15:05:59 +0000 Subject: [PATCH 33/74] Revert^2 "Set big core to cpu skip mask by default" This reverts commit 5d7958215d018afea719575a7e9fe4f17117721a. Reason for revert: 24Q4 kernel prebuilt ready Bug: 248621289 Change-Id: Ia9fbfb2ead5c42fa849758ffba9210cf45b6396f Test: build pass --- perf/powerhint-husky.json | 63 ++++++++++++++++++++++++++++++++ perf/powerhint-ripcurrent.json | 63 ++++++++++++++++++++++++++++++++ perf/powerhint-shiba.json | 65 +++++++++++++++++++++++++++++++++- 3 files changed, 190 insertions(+), 1 deletion(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index b944c9c..d215204 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -282,6 +282,15 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUSkipMask", + "Path": "/proc/vendor_sched/cpu_skip_mask", + "Values": [ + "0x0", + "0x80" + ], + "ResetOnInit": true + }, { "Name": "BGUClampMaxBoost", "Path": "/proc/vendor_sched/groups/bg/uclamp_max", @@ -842,6 +851,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -995,6 +1010,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1275,6 +1296,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1845,6 +1872,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2007,6 +2040,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2157,6 +2196,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2247,6 +2292,12 @@ "Duration": 0, "Value": "4-8" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2391,6 +2442,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", @@ -3034,6 +3091,12 @@ "Duration": 0, "Value": "0-8" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MIFTargetLoad", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index f5f1ca1..df0f423 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -268,6 +268,15 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUSkipMask", + "Path": "/proc/vendor_sched/cpu_skip_mask", + "Values": [ + "0x0", + "0x80" + ], + "ResetOnInit": true + }, { "Name": "BGUClampMaxBoost", "Path": "/proc/vendor_sched/groups/bg/uclamp_max", @@ -864,6 +873,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -1017,6 +1032,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1274,6 +1295,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -1694,6 +1721,12 @@ "Duration": 0, "Value": "0-8" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1844,6 +1877,12 @@ "Duration": 0, "Value": "4-8" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -1976,6 +2015,12 @@ "Duration": 0, "Value": "4-8" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2060,6 +2105,12 @@ "Duration": 0, "Value": "4-8" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2204,6 +2255,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", @@ -2817,6 +2874,12 @@ "Duration": 0, "Value": "4-8" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MIFTargetLoad", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index c9ca7d2..3345675 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -282,6 +282,15 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUSkipMask", + "Path": "/proc/vendor_sched/cpu_skip_mask", + "Values": [ + "0x0", + "0x80" + ], + "ResetOnInit": true + }, { "Name": "BGUClampMaxBoost", "Path": "/proc/vendor_sched/groups/bg/uclamp_max", @@ -842,6 +851,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -995,6 +1010,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1281,6 +1302,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1749,6 +1776,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1911,6 +1944,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2061,6 +2100,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2157,12 +2202,18 @@ "Duration": 0, "Value": "cam1" }, - { + { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUUtilThreshold", "Duration": 0, "Value": "1280" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferHighCap", @@ -2295,6 +2346,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", @@ -2938,6 +2995,12 @@ "Duration": 0, "Value": "0-8" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MIFTargetLoad", From b1025166588733d49bbf5bd679fcc9e20d4d4305 Mon Sep 17 00:00:00 2001 From: James Huang Date: Fri, 26 Jul 2024 15:03:06 +0800 Subject: [PATCH 34/74] gps: Enable Beidou measurements only in the US for P23. Bug: 354884462 Test: Field test in the US Change-Id: Ieaa8d77e6119402d35888078000ab5b57f5a5cc3 --- location/gps.xml.hk3 | 1 + location/gps.xml.sb3 | 1 + location/gps_user.xml.hk3 | 1 + location/gps_user.xml.sb3 | 1 + 4 files changed, 4 insertions(+) diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3 index 9911a81..5e926b8 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -100,6 +100,7 @@ diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3 index 5d380e4..712347b 100644 --- a/location/gps.xml.sb3 +++ b/location/gps.xml.sb3 @@ -100,6 +100,7 @@ diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3 index 3a0f045..5259125 100644 --- a/location/gps_user.xml.hk3 +++ b/location/gps_user.xml.hk3 @@ -99,6 +99,7 @@ diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3 index 463fd07..9e49927 100644 --- a/location/gps_user.xml.sb3 +++ b/location/gps_user.xml.sb3 @@ -99,6 +99,7 @@ From fab7721b14ab81437fbd35fbbd39fa84b7cca115 Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 25 Jul 2024 18:25:47 +0000 Subject: [PATCH 35/74] Adpf:shusky: switch to multitier heuristic boost. Bug: 344685639 Test: Checked the trace file running on the device. Flag: NONE powerhal doesn't have a flag yet Change-Id: I8b3918ee11a34315155561bfd0b0a7e9a8f9f32d --- perf/powerhint-husky.json | 33 ++++++++++++++++++--------------- perf/powerhint-ripcurrent.json | 33 ++++++++++++++++++--------------- perf/powerhint-shiba.json | 33 ++++++++++++++++++--------------- 3 files changed, 54 insertions(+), 45 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 39ab9ad..def0f7b 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -3076,11 +3076,12 @@ "GpuBoost": true, "GpuCapacityBoostMax": 40000, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.3, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -3113,11 +3114,12 @@ "GpuBoost": true, "GpuCapacityBoostMax": 32500, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.35, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -3150,11 +3152,12 @@ "GpuBoost": true, "GpuCapacityBoostMax": 25000, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.25, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 48af0bb..62dd88f 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -2851,11 +2851,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -2886,11 +2887,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -2921,11 +2923,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 0c2704e..0fc419e 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -2980,11 +2980,12 @@ "GpuBoost": true, "GpuCapacityBoostMax": 150000, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.3, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -3017,11 +3018,12 @@ "GpuBoost": true, "GpuCapacityBoostMax": 125000, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.35, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -3054,11 +3056,12 @@ "GpuBoost": true, "GpuCapacityBoostMax": 100000, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.25, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 From 70db494120d7cd530ba1670d67e0229fe66d5682 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Mon, 29 Jul 2024 04:01:55 +0000 Subject: [PATCH 36/74] gps: Enable ExitOnComFailure Enable ExitOnComFailure so gpsd will call exit() instead of calling abort() when com failed due to system performance degradation. Test: on device Bug: 341508348 Change-Id: I7994d65f5ac8441f8ed69fb256de9d3afff7919c --- location/gps.6.1.xml.hk3 | 1 + location/gps.6.1.xml.sb3 | 1 + location/gps.xml | 1 + location/gps.xml.hk3 | 1 + location/gps.xml.sb3 | 1 + 5 files changed, 5 insertions(+) diff --git a/location/gps.6.1.xml.hk3 b/location/gps.6.1.xml.hk3 index beba2bb..20329db 100644 --- a/location/gps.6.1.xml.hk3 +++ b/location/gps.6.1.xml.hk3 @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" diff --git a/location/gps.6.1.xml.sb3 b/location/gps.6.1.xml.sb3 index fe5065b..a848fd9 100644 --- a/location/gps.6.1.xml.sb3 +++ b/location/gps.6.1.xml.sb3 @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" diff --git a/location/gps.xml b/location/gps.xml index 21d6109..7441f38 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3 index 9911a81..b238f9b 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3 index 5d380e4..1abf8e2 100644 --- a/location/gps.xml.sb3 +++ b/location/gps.xml.sb3 @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" From 1d8cabd8fd52fc6b4fa3a2f3f6bb4cd8ce046bf2 Mon Sep 17 00:00:00 2001 From: Bao Do Date: Mon, 29 Jul 2024 14:49:31 +0800 Subject: [PATCH 37/74] Add set scenarios and configurations files for P23 projects. This is a clone of the default files, only GAME scenarios has some order changed to prioritize 48k gaming without source. Bug: 331490291 Test: Check file location Flag: NONE system property change only Change-Id: Ib367e638fc25bd1c8e8be16d5b062ece59354b99 --- bluetooth/audio_set_configurations.json | 7492 +++++++++++++++++++++++ bluetooth/audio_set_scenarios.json | 259 + device-husky.mk | 7 + device-shiba.mk | 7 + 4 files changed, 7765 insertions(+) create mode 100644 bluetooth/audio_set_configurations.json create mode 100644 bluetooth/audio_set_scenarios.json diff --git a/bluetooth/audio_set_configurations.json b/bluetooth/audio_set_configurations.json new file mode 100644 index 0000000..6a03f6b --- /dev/null +++ b/bluetooth/audio_set_configurations.json @@ -0,0 +1,7492 @@ +{ + "_comments_": [ + " == Audio Set Configurations == ", + " Contains: ", + " 1. configurations : ", + " Maps configuration name with codec and qos config to be used", + " 2. codec_configurations : ", + " Array of codec specific configurations", + " 3. qos_configurations : ", + " Array of QoS specific configurations", + " QoS configuration values are as per BAP spec 1.0", + " Example values which can be used as 'codec_configuration.type'", + " Codec Configuration parameter types:", + " SUPPORTED_SAMPLING_FREQUENCY = 1", + " SUPPORTED_FRAME_DURATION = 2", + " SUPPORTED_OCTETS_PER_CODEC_FRAME = 4", + " SUPPORTED_CODEC_FRAME_BLOCKS_PER_SDU = 5", + " Example values which can be used as 'codec_configuration.compound_value'", + " Codec Coding formats:", + " LC3 = 6", + " Sampling Frequencies: ", + " 8000Hz = 1", + " 11025Hz = 2", + " 16000Hz = 3", + " 22050Hz = 4", + " 24000Hz = 5", + " 32000Hz = 6", + " 44100Hz = 7", + " 48000Hz = 8", + " 88200Hz = 9", + " 96000Hz = 10", + " 176400Hz = 11", + " 192000Hz = 12", + " 384000Hz = 13", + " Frame Durations:", + " 7500us = 0", + " 10000us = 1" + ], + "configurations": [ + { + "name": "Two-OneChan-SnkAse-Lc3_16_1_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_2" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1_Balanced_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1_1", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_1" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1_2", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_2" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2_1", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_1" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2_2", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_2" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_32_1_Balanced_Reliability", + "codec_config_name": "One-OneChan-SnkAse-Lc3_32_1", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_32_1_1", + "codec_config_name": "One-OneChan-SnkAse-Lc3_32_1", + "qos_config_name": [ + "QoS_Config_32_1_1" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_32_1_2", + "codec_config_name": "One-OneChan-SnkAse-Lc3_32_1", + "qos_config_name": [ + "QoS_Config_32_1_2" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_32_2_Balanced_Reliability", + "codec_config_name": "One-OneChan-SnkAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_32_2_1", + "codec_config_name": "One-OneChan-SnkAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_32_2_1" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_32_2_2", + "codec_config_name": "One-OneChan-SnkAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_32_2_2" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_1_Balanced_Reliability", + "codec_config_name": "One-OneChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_1_1", + "codec_config_name": "One-OneChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_1" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_1_2", + "codec_config_name": "One-OneChan-SnkAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "One-OneChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_2_1", + "codec_config_name": "One-OneChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_1" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_2_2", + "codec_config_name": "One-OneChan-SnkAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_2" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_1", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_32_2_1" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_2", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_2" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_1", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_1" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_2", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_2" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_1", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_1" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_1" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_2", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_2" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_1" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_2", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_2" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "codec_config_name": "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1", + "codec_config_name": "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_1" + ] + }, + { + "name": "Two-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_48_4_Balanced_Reliability", + "codec_config_name": "One-OneChan-SrcAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_48_3_Balanced_Reliability", + "codec_config_name": "One-OneChan-SrcAse-Lc3_48_3", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_48_2_Balanced_Reliability", + "codec_config_name": "One-OneChan-SrcAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_48_1_Balanced_Reliability", + "codec_config_name": "One-OneChan-SrcAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "codec_config_name": "One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_32_1_Balanced_Reliability", + "codec_config_name": "One-OneChan-SrcAse-Lc3_32_1", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "codec_config_name": "One-OneChan-SrcAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_24_1_Balanced_Reliability", + "codec_config_name": "One-OneChan-SrcAse-Lc3_24_1", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_16_1_Balanced_Reliability", + "codec_config_name": "One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_2", + "codec_config_name": "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "qos_config_name": [ + "QoS_Config_16_1_2" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "codec_config_name": "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1", + "codec_config_name": "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_1" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_2", + "codec_config_name": "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_16_2_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_24_1_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_24_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_24_1_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_24_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_24_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_24_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_24_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_24_2_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_24_2_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_24_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_24_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_24_2_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_24_2_2" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_24_2_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_24_2_Balanced_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_24_2_2", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_24_2_2" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_24_2_Balanced_Reliability", + "codec_config_name": "One-OneChan-SnkAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_24_2_2", + "codec_config_name": "One-OneChan-SnkAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_24_2_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_32_2_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_32_2_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_1_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_32_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_32_1_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_32_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_1_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_32_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_32_2_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_32_2_1" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "codec_config_name": "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "codec_config_name": "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_32_2_1" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_32_2_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4_High_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_48_4_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_48_4_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_3_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_3", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_3_High_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_3", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_3_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_3", + "qos_config_name": [ + "QoS_Config_48_3_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_2_High_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_2_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_48_2_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_1_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_1_High_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_1_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_48_1_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4_High_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4_1", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_48_4_1" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_48_4_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_3_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_3", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_3_High_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_3", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_3_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_3", + "qos_config_name": [ + "QoS_Config_48_3_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_2_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_2_High_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_2_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_48_2_2" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_1_Low_Latency", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_1_High_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_1_2", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_48_1_2" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4_High_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4_1", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_48_4_1" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4_2", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_48_4_2" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_3_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_3", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_3_High_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_3", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_3_2", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_3", + "qos_config_name": [ + "QoS_Config_48_3_2" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_2_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_2_High_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_2_2", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_48_2_2" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_1_Low_Latency", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_1_High_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_1_2", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_48_1_2" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_4_High_Reliability", + "codec_config_name": "One-OneChan-SnkAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_4_1", + "codec_config_name": "One-OneChan-SnkAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_48_4_1" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_4_2", + "codec_config_name": "One-OneChan-SnkAse-Lc3_48_4", + "qos_config_name": [ + "QoS_Config_48_4_2" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_3_High_Reliability", + "codec_config_name": "One-OneChan-SnkAse-Lc3_48_3", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_3_2", + "codec_config_name": "One-OneChan-SnkAse-Lc3_48_3", + "qos_config_name": [ + "QoS_Config_48_3_2" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_2_High_Reliability", + "codec_config_name": "One-OneChan-SnkAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_2_2", + "codec_config_name": "One-OneChan-SnkAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_48_2_2" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_1_High_Reliability", + "codec_config_name": "One-OneChan-SnkAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_1_2", + "codec_config_name": "One-OneChan-SnkAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_48_1_2" + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSnk_OneChanStereoSrc_32khz_60octs_Low_Latency_1", + "codec_config_name": "VND_SingleDev_TwoChanStereoSnk_OneChanStereoSrc_32khz_60octs_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSnk_OneChanStereoSrc_32khz_60oct_R3_L22_1", + "codec_config_name": "VND_SingleDev_TwoChanStereoSnk_OneChanStereoSrc_32khz_60octs_1", + "qos_config_name": [ + "VND_QoS_Config_R3_L22" + ] + }, + { + "name": "VND_DualDev_OneChanStereoSnk_48khz_100octs_High_Reliability_1", + "codec_config_name": "VND_DualDev_OneChanStereoSnk_48khz_100octs_1", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "VND_DualDev_OneChanStereoSnk_48khz_100octs_R15_L70_1", + "codec_config_name": "VND_DualDev_OneChanStereoSnk_48khz_100octs_1", + "qos_config_name": [ + "VND_QoS_Config_R15_L70" + ] + }, + { + "name": "VND_SingleDev_OneChanStereoSnk_48khz_100octs_High_Reliability_1", + "codec_config_name": "VND_SingleDev_OneChanStereoSnk_48khz_100octs_1", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "VND_SingleDev_OneChanStereoSnk_48khz_100octs_R15_L70_1", + "codec_config_name": "VND_SingleDev_OneChanStereoSnk_48khz_100octs_1", + "qos_config_name": [ + "VND_QoS_Config_R15_L70" + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSnk_48khz_100octs_High_Reliability_1", + "codec_config_name": "VND_SingleDev_TwoChanStereoSnk_48khz_100octs_1", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSnk_48khz_100octs_R15_L70_1", + "codec_config_name": "VND_SingleDev_TwoChanStereoSnk_48khz_100octs_1", + "qos_config_name": [ + "VND_QoS_Config_R15_L70" + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_High_Reliability_1", + "codec_config_name": "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_1", + "qos_config_name": [ + "QoS_Config_High_Reliability" + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_R5_L12_1", + "codec_config_name": "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_1", + "qos_config_name": [ + "VND_QoS_Config_R5_L12" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "codec_config_name": "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "codec_config_name": "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "codec_config_name": "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1_Low_Latency", + "codec_config_name": "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1_Balanced_Reliability", + "codec_config_name": "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2_Low_Latency", + "codec_config_name": "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_Low_Latency" + ] + }, + { + "name": "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2_Balanced_Reliability", + "codec_config_name": "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_Balanced_Reliability_1", + "codec_config_name": "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_1", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_R11_L40_1", + "codec_config_name": "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_1", + "qos_config_name": [ + "VND_QoS_Config_R11_L40" + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_R5_L12_TwoChanStereoSrc_16khz_30octs_R3_L12_1", + "codec_config_name": "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_TwoChanStereoSrc_16khz_30octs_1", + "qos_config_name": [ + "VND_QoS_Config_R5_L12", + "VND_QoS_Config_R3_L12" + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_TwoChanStereoSrc_16khz_30octs_Balanced_Reliability_1", + "codec_config_name": "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_TwoChanStereoSrc_16khz_30octs_1", + "qos_config_name": [ + "QoS_Config_Balanced_Reliability" + ] + } + ], + "codec_configurations": [ + { + "name": "Two-OneChan-SnkAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "Two-OneChan-SrcAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_24_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 5 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_1", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_32_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 2, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 2, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_48_4", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_48_3", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 90, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_48_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 100, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_48_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 75, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_32_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_24_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 5 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 45, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SrcAse-Lc3_16_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_3", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 90, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 100, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_1", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 75, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_3", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 90, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 100, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 75, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_4", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_3", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 90, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 100, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 75, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSnk_48khz_100octs_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 100, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "VND_DualDev_OneChanStereoSnk_48khz_100octs_1", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 100, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "VND_SingleDev_OneChanStereoSnk_48khz_100octs_1", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 100, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 75, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 2, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_24_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 2, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 5 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 2, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 5 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_24_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 5 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 5 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 5 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 120, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 40, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 75, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 75, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 100, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 100, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 100, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSnk_OneChanStereoSrc_32khz_60octs_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_TwoChanStereoSrc_16khz_30octs_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 8 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 75, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 3 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 30, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_24_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 5 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_24_1", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 5 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 45, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_24_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 5 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_24_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 5 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 45, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_24_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 5 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 2, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 2, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + }, + { + "ase_cnt": 1, + "direction": "SOURCE", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 1 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_32_2", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 1 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 80, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + }, + { + "name": "One-TwoChan-SnkAse-Lc3_32_1", + "subconfigurations": [ + { + "ase_cnt": 1, + "direction": "SINK", + "codec_id": { + "coding_format": 6, + "vendor_company_id": 0, + "vendor_codec_id": 0 + }, + "codec_configuration": [ + { + "name": "sampling_frequency", + "type": 1, + "compound_value": { + "value": [ + 6 + ] + } + }, + { + "name": "frame_duration", + "type": 2, + "compound_value": { + "value": [ + 0 + ] + } + }, + { + "name": "octets_per_codec_frame", + "type": 4, + "compound_value": { + "value": [ + 60, + 0 + ] + } + }, + { + "name": "codec_frame_blocks_per_sdu", + "type": 5, + "compound_value": { + "value": [ + 1 + ] + } + } + ], + "ase_channel_cnt": 2 + } + ] + } + ], + "qos_configurations": [ + { + "name": "QoS_Config_16_1_1", + "retransmission_number": 2, + "max_transport_latency": 8 + }, + { + "name": "QoS_Config_16_1_2", + "retransmission_number": 13, + "max_transport_latency": 75 + }, + { + "name": "QoS_Config_16_2_1", + "retransmission_number": 2, + "max_transport_latency": 10 + }, + { + "name": "QoS_Config_16_2_2", + "retransmission_number": 13, + "max_transport_latency": 95 + }, + { + "name": "QoS_Config_24_1_1", + "retransmission_number": 2, + "max_transport_latency": 8 + }, + { + "name": "QoS_Config_24_1_2", + "retransmission_number": 13, + "max_transport_latency": 75 + }, + { + "name": "QoS_Config_24_2_1", + "retransmission_number": 2, + "max_transport_latency": 10 + }, + { + "name": "QoS_Config_24_2_2", + "retransmission_number": 13, + "max_transport_latency": 95 + }, + { + "name": "QoS_Config_32_1_1", + "retransmission_number": 2, + "max_transport_latency": 8 + }, + { + "name": "QoS_Config_32_1_2", + "retransmission_number": 13, + "max_transport_latency": 75 + }, + { + "name": "QoS_Config_32_2_1", + "retransmission_number": 2, + "max_transport_latency": 10 + }, + { + "name": "QoS_Config_32_2_2", + "retransmission_number": 13, + "max_transport_latency": 95 + }, + { + "name": "QoS_Config_48_1_2", + "retransmission_number": 13, + "max_transport_latency": 75 + }, + { + "name": "QoS_Config_48_2_2", + "retransmission_number": 13, + "max_transport_latency": 95 + }, + { + "name": "QoS_Config_48_3_2", + "retransmission_number": 13, + "max_transport_latency": 75 + }, + { + "name": "QoS_Config_48_4_1", + "retransmission_number": 5, + "max_transport_latency": 20 + }, + { + "name": "QoS_Config_48_4_2", + "retransmission_number": 13, + "max_transport_latency": 100 + }, + { + "name": "VND_QoS_Config_R3_L22", + "retransmission_number": 3, + "max_transport_latency": 22 + }, + { + "name": "VND_QoS_Config_R15_L70", + "retransmission_number": 15, + "max_transport_latency": 70 + }, + { + "name": "VND_QoS_Config_R5_L12", + "retransmission_number": 5, + "max_transport_latency": 12 + }, + { + "name": "VND_QoS_Config_R11_L40", + "retransmission_number": 11, + "max_transport_latency": 40 + }, + { + "name": "VND_QoS_Config_R3_L12", + "retransmission_number": 3, + "max_transport_latency": 12 + }, + { + "name": "QoS_Config_Low_Latency", + "target_latency": "LOW", + "retransmission_number": 0, + "max_transport_latency": 0 + }, + { + "name": "QoS_Config_Balanced_Reliability", + "target_latency": "BALANCED_RELIABILITY", + "retransmission_number": 0, + "max_transport_latency": 0 + }, + { + "name": "QoS_Config_High_Reliability", + "target_latency": "HIGH_RELIABILITY", + "retransmission_number": 0, + "max_transport_latency": 0 + } + ] +} diff --git a/bluetooth/audio_set_scenarios.json b/bluetooth/audio_set_scenarios.json new file mode 100644 index 0000000..ec36d87 --- /dev/null +++ b/bluetooth/audio_set_scenarios.json @@ -0,0 +1,259 @@ +{ + "_comments_": [ + "== Audio Set Scenarios ==", + " Each defined scenario references externally defined audio set", + " configurations, listed in the order of priority." + ], + "scenarios": [ + { + "name": "Conversational", + "configurations": [ + "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1", + "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_1", + "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_2", + "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_1", + "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_2", + "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1", + "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1", + "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_1", + "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_1", + "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_2", + "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_1", + "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_2", + "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1", + "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1", + "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1", + "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1", + "Two-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_48_4_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_48_2_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_48_3_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_48_1_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_32_1_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_24_1_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_16_1_Balanced_Reliability", + "VND_SingleDev_TwoChanStereoSnk_OneChanStereoSrc_32khz_60oct_R3_L22_1", + "Two-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability", + "One-TwoChan-SnkAse-Lc3_16_2_Balanced_Reliability", + "One-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability" + ] + }, + { + "name": "Media", + "configurations": [ + "Two-OneChan-SnkAse-Lc3_48_4_High_Reliability", + "Two-OneChan-SnkAse-Lc3_48_4_2", + "Two-OneChan-SnkAse-Lc3_48_2_High_Reliability", + "Two-OneChan-SnkAse-Lc3_48_2_2", + "Two-OneChan-SnkAse-Lc3_48_3_High_Reliability", + "Two-OneChan-SnkAse-Lc3_48_3_2", + "Two-OneChan-SnkAse-Lc3_48_1_High_Reliability", + "Two-OneChan-SnkAse-Lc3_48_1_2", + "Two-OneChan-SnkAse-Lc3_24_2_Balanced_Reliability", + "Two-OneChan-SnkAse-Lc3_24_2_2", + "Two-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability", + "Two-OneChan-SnkAse-Lc3_16_2_2", + "Two-OneChan-SnkAse-Lc3_16_1_Balanced_Reliability", + "Two-OneChan-SnkAse-Lc3_16_1_2", + "One-TwoChan-SnkAse-Lc3_48_4_High_Reliability", + "One-TwoChan-SnkAse-Lc3_48_4_2", + "One-TwoChan-SnkAse-Lc3_48_2_High_Reliability", + "One-TwoChan-SnkAse-Lc3_48_2_2", + "One-TwoChan-SnkAse-Lc3_48_3_High_Reliability", + "One-TwoChan-SnkAse-Lc3_48_3_2", + "One-TwoChan-SnkAse-Lc3_48_1_High_Reliability", + "One-TwoChan-SnkAse-Lc3_48_1_2", + "One-TwoChan-SnkAse-Lc3_24_2_Balanced_Reliability", + "One-TwoChan-SnkAse-Lc3_24_2_2", + "One-TwoChan-SnkAse-Lc3_16_2_Balanced_Reliability", + "One-TwoChan-SnkAse-Lc3_16_2_2", + "One-TwoChan-SnkAse-Lc3_16_1_Balanced_Reliability", + "One-TwoChan-SnkAse-Lc3_16_1_2", + "One-OneChan-SnkAse-Lc3_48_4_High_Reliability", + "One-OneChan-SnkAse-Lc3_48_4_2", + "One-OneChan-SnkAse-Lc3_48_2_High_Reliability", + "One-OneChan-SnkAse-Lc3_48_2_2", + "One-OneChan-SnkAse-Lc3_48_3_High_Reliability", + "One-OneChan-SnkAse-Lc3_48_3_2", + "One-OneChan-SnkAse-Lc3_48_1_High_Reliability", + "One-OneChan-SnkAse-Lc3_48_1_2", + "One-OneChan-SnkAse-Lc3_32_2_Balanced_Reliability", + "One-OneChan-SnkAse-Lc3_32_2_2", + "One-OneChan-SnkAse-Lc3_32_1_Balanced_Reliability", + "One-OneChan-SnkAse-Lc3_32_1_2", + "One-OneChan-SnkAse-Lc3_24_2_Balanced_Reliability", + "One-OneChan-SnkAse-Lc3_24_2_2", + "One-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability", + "One-OneChan-SnkAse-Lc3_16_2_2", + "One-OneChan-SnkAse-Lc3_16_1_Balanced_Reliability", + "One-OneChan-SnkAse-Lc3_16_1_2", + "VND_DualDev_OneChanStereoSnk_48khz_100octs_High_Reliability_1", + "VND_DualDev_OneChanStereoSnk_48khz_100octs_R15_L70_1", + "VND_SingleDev_TwoChanStereoSnk_48khz_100octs_High_Reliability_1", + "VND_SingleDev_TwoChanStereoSnk_48khz_100octs_R15_L70_1", + "VND_SingleDev_OneChanStereoSnk_48khz_100octs_High_Reliability_1", + "VND_SingleDev_OneChanStereoSnk_48khz_100octs_R15_L70_1", + "Two-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability" + ] + }, + { + "name": "Game", + "configurations": [ + "One-TwoChan-SnkAse-Lc3_48_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_48_3_Low_Latency", + "One-TwoChan-SnkAse-Lc3_48_1_Low_Latency", + "One-TwoChan-SnkAse-Lc3_32_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_32_1_Low_Latency", + "One-TwoChan-SnkAse-Lc3_24_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_24_1_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_1_Low_Latency", + "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1", + "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2_Low_Latency", + "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1_Low_Latency", + "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency", + "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_TwoChanStereoSrc_16khz_30octs_Balanced_Reliability_1", + "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_R5_L12_TwoChanStereoSrc_16khz_30octs_R3_L12_1", + "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_High_Reliability_1", + "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_R5_L12_1", + "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "Two-OneChan-SnkAse-Lc3_48_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_48_3_Low_Latency", + "Two-OneChan-SnkAse-Lc3_48_1_Low_Latency", + "Two-OneChan-SnkAse-Lc3_32_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_32_1_Low_Latency", + "Two-OneChan-SnkAse-Lc3_24_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_24_1_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_1_Low_Latency" + ] + }, + { + "name": "VoiceAssistants", + "configurations": [ + "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1", + "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_1", + "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_1", + "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2_Balanced_Reliability", + "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1_Balanced_Reliability", + "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_1", + "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_1", + "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_1", + "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1", + "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1", + "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1", + "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1", + "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability", + "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability" + ] + }, + { + "name": "Live", + "configurations": [ + "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_Balanced_Reliability_1", + "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_R11_L40_1", + "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1", + "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_1", + "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_1", + "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2_Balanced_Reliability", + "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1_Balanced_Reliability", + "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_1", + "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_1", + "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_1", + "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1", + "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1", + "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1", + "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1", + "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency", + "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1", + "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency", + "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1", + "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency", + "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1", + "One-OneChan-SrcAse-Lc3_48_2_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_48_1_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_32_1_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability", + "One-OneChan-SrcAse-Lc3_16_1_Balanced_Reliability" + ] + } + ] +} diff --git a/device-husky.mk b/device-husky.mk index eecedb0..a2e4c36 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -495,3 +495,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Set support for LEA multicodec PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.core.le_audio.codec_extension_aidl.enabled=true + +# LE Audio configuration scenarios +PRODUCT_COPY_FILES += \ + device/google/shusky/bluetooth/audio_set_scenarios.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_scenarios.json + +PRODUCT_COPY_FILES += \ + device/google/shusky/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json diff --git a/device-shiba.mk b/device-shiba.mk index d29c580..838ee76 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -464,3 +464,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Set support for LEA multicodec PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.core.le_audio.codec_extension_aidl.enabled=true + +# LE Audio configuration scenarios +PRODUCT_COPY_FILES += \ + device/google/caimito/bluetooth/audio_set_scenarios.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_scenarios.json + +PRODUCT_COPY_FILES += \ + device/google/caimito/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json From 1c8c1a160e3efc11e2f07cbab39f9601f5b728c2 Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Mon, 22 Jul 2024 17:06:14 -0700 Subject: [PATCH 38/74] haptics: Update output distortion gain Recommended output distortion gain is 0.38. Bug: 328799172 Test: getprop | grep hapticgenerator Flag: EXEMPT bugfix Change-Id: Iaf6b88680c05fe14a46d3d7fe9fe43bdc05b9314 --- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index 1c1e3b0..82e22fe 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -401,6 +401,10 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \ ro.vendor.vibrator.hal.pm.activetimeout=5 +# Override Output Distortion Gain +PRODUCT_VENDOR_PROPERTIES += \ + vendor.audio.hapticgenerator.distortion.output.gain=0.38 + # Increment the SVN for any official public releases ifdef RELEASE_SVN_HUSKY TARGET_SVN ?= $(RELEASE_SVN_HUSKY) diff --git a/device-shiba.mk b/device-shiba.mk index a6b6093..55289b3 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -378,6 +378,10 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \ ro.vendor.vibrator.hal.pm.activetimeout=5 +# Override Output Distortion Gain +PRODUCT_VENDOR_PROPERTIES += \ + vendor.audio.hapticgenerator.distortion.output.gain=0.38 + # Increment the SVN for any official public releases ifdef RELEASE_SVN_SHIBA TARGET_SVN ?= $(RELEASE_SVN_SHIBA) From 28a1b27468d204366837ce4ce8e2e5559ac6bf2a Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 19 Apr 2024 20:59:35 +0000 Subject: [PATCH 39/74] shusky: Add build_flags based properties for SMR/EMR build Flag: build.RELEASE_IS_SMR Flag: build.RELEASE_IS_EMR Flag: build.RELEASE_BASE_OS_HUSKY Flag: build.RELEASE_BASE_OS_SHIBA Bug: 155105803 Change-Id: Ibec4f0c908089ca4304e59e9d37529fa2d4fa40d --- device-husky.mk | 18 ++++++++++++++++++ device-shiba.mk | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index eecedb0..c1a81fc 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -412,6 +412,24 @@ endif PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.build.svn=$(TARGET_SVN) +# Set device family property for SMR +PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.device_family=HK3SB3AK3 + +# Set build properties for SMR builds +ifeq ($(RELEASE_IS_SMR), true) + ifneq (,$(RELEASE_BASE_OS_HUSKY)) + PRODUCT_BASE_OS := $(RELEASE_BASE_OS_HUSKY) + endif +endif + +# Set build properties for EMR builds +ifeq ($(RELEASE_IS_EMR), true) + ifneq (,$(RELEASE_BASE_OS_HUSKY)) + PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_HUSKY) + endif +endif # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ diff --git a/device-shiba.mk b/device-shiba.mk index d29c580..b201cff 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -389,6 +389,24 @@ endif PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.build.svn=$(TARGET_SVN) +# Set device family property for SMR +PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.device_family=HK3SB3AK3 + +# Set build properties for SMR builds +ifeq ($(RELEASE_IS_SMR), true) + ifneq (,$(RELEASE_BASE_OS_SHIBA)) + PRODUCT_BASE_OS := $(RELEASE_BASE_OS_SHIBA) + endif +endif + +# Set build properties for EMR builds +ifeq ($(RELEASE_IS_EMR), true) + ifneq (,$(RELEASE_BASE_OS_SHIBA)) + PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_SHIBA) + endif +endif # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.rls_supported=false From cd69a5a8855238936ae4d46d66b84a7b25586faa Mon Sep 17 00:00:00 2001 From: samou Date: Fri, 12 Jul 2024 05:31:11 +0000 Subject: [PATCH 40/74] thermal: Remove bcl related tzones Flag: EXEMPT tuning changes Bug: 349935208 Test: Confirm boot Change-Id: I5091b906604fe5dec3b7e8ac6631fcd3acb0989d Signed-off-by: samou --- perf/powerhint-husky.json | 12 -- perf/powerhint-ripcurrent.json | 12 -- perf/powerhint-shiba.json | 12 -- thermal/thermal_info_config_husky.json | 93 -------- thermal/thermal_info_config_ripcurrent.json | 225 -------------------- thermal/thermal_info_config_shiba.json | 93 -------- 6 files changed, 447 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 1c29123..d536600 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2632,18 +2632,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "100" - }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "1500" - }, { "PowerHint": "EXPENSIVE_RENDERING", "Node": "PowerHALRenderingState", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 48af0bb..177c250 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -2391,18 +2391,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "100" - }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "1500" - }, { "PowerHint": "EXPENSIVE_RENDERING", "Node": "PowerHALRenderingState", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index fb000e1..2f1e5cc 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -2536,18 +2536,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "100" - }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "1500" - }, { "PowerHint": "EXPENSIVE_RENDERING", "Node": "PowerHALRenderingState", diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 41fc3ba..b53d46b 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -85,99 +85,6 @@ "PollingDelay":60000, "PassiveDelay":7000 }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE" - }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":["battery", "battery_cycle", "vdroop1"], - "Coefficient":[-10000, 400, 1000], - "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", 3.00, "NaN"], - "Multiplier":1, - "PollingDelay":0, - "PassiveDelay":1000, - "SendCallback":true - }, - { - "Name":"FLASH_LED_REDUCE", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":["battery", "battery_cycle", "vdroop1"], - "Coefficient":[-10000, 400, 1000], - "HotThreshold":["NaN", "NaN", "NaN", "NaN", 3.00, "NaN", "NaN"], - "Multiplier":1, - "PollingDelay":0, - "PassiveDelay":1000, - "SendCallback":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":["NaN", "NaN", 80, "NaN", "NaN", "NaN", "NaN"], - "Multiplier":1 - }, - { - "Name":"batoilo", - "Type":"BCL_CURRENT", - "HotThreshold":["NaN", "NaN", "NaN", "NaN", 5000, "NaN", "NaN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "SendCallback":true, - "PollingDelay":0, - "PassiveDelay":1000 - }, - { - "Name":"BCL_AUDIO_BAACL", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "soc", - "Combination":["battery", "soc"], - "Coefficient":[-25000, 80], - "HotThreshold":["NaN", "NaN", "NaN", "NaN", 2.0, "NaN", "NaN"], - "PollingDelay":0, - "PassiveDelay":600000, - "Multiplier":1, - "SendCallback":true - }, - { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NaN", "NaN", "NaN", "NaN", 1000, "NaN", "NaN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "SendCallback":true, - "PollingDelay":0, - "PassiveDelay":1000 - }, - { - "Name":"vdroop2", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NaN", "NaN", "NaN", "NaN", 1200, "NaN", "NaN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "SendCallback":true, - "PollingDelay":0, - "PassiveDelay":1000 - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NaN", "NaN", "NaN", "NaN", 1100, "NaN", "NaN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "SendCallback":true, - "PollingDelay":0, - "PassiveDelay":1000 - }, { "Name":"VIRTUAL-BTS-WINDOW-PARTIAL", "Type":"UNKNOWN", diff --git a/thermal/thermal_info_config_ripcurrent.json b/thermal/thermal_info_config_ripcurrent.json index 45d2f36..3d394dd 100644 --- a/thermal/thermal_info_config_ripcurrent.json +++ b/thermal/thermal_info_config_ripcurrent.json @@ -60,231 +60,6 @@ "VrThreshold":"NaN", "Multiplier":0.001 }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NaN", - "NaN", - "NaN", - "NaN", - "NaN", - "NaN", - "NaN" - ], - "VrThreshold":"NaN", - "Multiplier":1, - "Monitor":false - }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NaN", - "NaN", - "NaN", - "NaN", - "NaN", - 3.00, - "NaN" - ], - "VrThreshold":"NaN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"FLASH_LED_REDUCE", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NaN", - "NaN", - "NaN", - "NaN", - 3.00, - "NaN", - "NaN" - ], - "VrThreshold":"NaN", - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NaN", - 80, - "NaN", - "NaN", - "NaN", - "NaN", - "NaN" - ], - "VrThreshold":"NaN", - "Multiplier":1 - }, - { - "Name":"batoilo", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NaN", - "NaN", - "NaN", - "NaN", - 5000, - "NaN", - "NaN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NaN", - "Multiplier":1, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000 - }, - { - "Name":"BCL_AUDIO_BAACL", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "soc", - "Combination":[ - "battery", - "soc" - ], - "Coefficient":[ - "-25000", - "80" - ], - "HotThreshold":[ - "NaN", - "NaN", - "NaN", - "NaN", - 2.0, - "NaN", - "NaN" - ], - "VrThreshold":"NaN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NaN", - "NaN", - "NaN", - "NaN", - 1000, - "NaN", - "NaN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NaN", - "Multiplier":1, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000 - }, - { - "Name":"vdroop2", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NaN", - "NaN", - "NaN", - "NaN", - 1200, - "NaN", - "NaN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NaN", - "Multiplier":1, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000 - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NaN", - "NaN", - "NaN", - "NaN", - 1100, - "NaN", - "NaN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NaN", - "Multiplier":1, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000 - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index a6bc952..fb826fd 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -85,99 +85,6 @@ "PollingDelay":60000, "PassiveDelay":7000 }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE" - }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":["battery", "battery_cycle", "vdroop1"], - "Coefficient":[-10000, 400, 1000], - "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", 3.00, "NaN"], - "Multiplier":1, - "PollingDelay":0, - "PassiveDelay":1000, - "SendCallback":true - }, - { - "Name":"FLASH_LED_REDUCE", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":["battery", "battery_cycle", "vdroop1"], - "Coefficient":[-10000, 400, 1000], - "HotThreshold":["NaN", "NaN", "NaN", "NaN", 3.00, "NaN", "NaN"], - "Multiplier":1, - "PollingDelay":0, - "PassiveDelay":1000, - "SendCallback":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":["NaN", "NaN", 80, "NaN", "NaN", "NaN", "NaN"], - "Multiplier":1 - }, - { - "Name":"batoilo", - "Type":"BCL_CURRENT", - "HotThreshold":["NaN", "NaN", "NaN", "NaN", 5000, "NaN", "NaN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "SendCallback":true, - "PollingDelay":0, - "PassiveDelay":1000 - }, - { - "Name":"BCL_AUDIO_BAACL", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "soc", - "Combination":["battery", "soc"], - "Coefficient":[-25000, 80], - "HotThreshold":["NaN", "NaN", "NaN", "NaN", 2.0, "NaN", "NaN"], - "PollingDelay":0, - "PassiveDelay":600000, - "Multiplier":1, - "SendCallback":true - }, - { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NaN", "NaN", "NaN", "NaN", 1000, "NaN", "NaN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "SendCallback":true, - "PollingDelay":0, - "PassiveDelay":1000 - }, - { - "Name":"vdroop2", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NaN", "NaN", "NaN", "NaN", 1200, "NaN", "NaN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "SendCallback":true, - "PollingDelay":0, - "PassiveDelay":1000 - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NaN", "NaN", "NaN", "NaN", 1100, "NaN", "NaN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "SendCallback":true, - "PollingDelay":0, - "PassiveDelay":1000 - }, { "Name":"VIRTUAL-SKIN-SUB-0", "Type":"UNKNOWN", From 1b68d9f7e61126545e90e94e05c3347dd3a07b17 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Wed, 7 Aug 2024 18:17:28 +0000 Subject: [PATCH 41/74] 16kb: Use TARGET_BOOTS_16K in aosp shusky targets Use a target build variable to indicate that the target boots with 16kb page sizes. Bug: 346868433 Test: Built aosp shusky targets with 16kb support $ source build/envsetup.sh $ lunch aosp_husky_pgagnostic-trunk_staging-userdebug $ get_build_var TARGET_BOOTS_16K true Change-Id: Ibd853aa5087bc0cb5b8457fa13e09e7d20a7b211 --- aosp_husky_pgagnostic.mk | 2 +- aosp_shiba_pgagnostic.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk index 00ac252..f633834 100644 --- a/aosp_husky_pgagnostic.mk +++ b/aosp_husky_pgagnostic.mk @@ -22,4 +22,4 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 - +TARGET_BOOTS_16K := true diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk index 40f0a48..0b23ed5 100644 --- a/aosp_shiba_pgagnostic.mk +++ b/aosp_shiba_pgagnostic.mk @@ -22,4 +22,4 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 - +TARGET_BOOTS_16K := true From f113c3653fb618c36e66ea16ed371f4260150cb7 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Fri, 9 Aug 2024 08:34:10 +0000 Subject: [PATCH 42/74] update OWNERS to include Android.bp Flag: EXEMPT only changing OWNERS Bug: 357036384 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b637565f8370fcef720283fc3cdbc89e73755798) Merged-In: I56a4fb43e7632e13e5779ebd661301f8d27d910b Change-Id: I56a4fb43e7632e13e5779ebd661301f8d27d910b --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index c7a36d1..1129dfd 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,4 @@ per-file perf/*,thermal/*= jenhaochen@google.com,wvw@google.com,joaodias@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS +per-file *.mk,*/BoardConfig.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS From 0dd1ab91a9e6cb15f2297e22e48de6bb18992195 Mon Sep 17 00:00:00 2001 From: Jay Date: Mon, 12 Aug 2024 16:44:22 +0000 Subject: [PATCH 43/74] powerhint: Lower CAM uclamp min Current CAM uclamp min is beyond MID clusters capacity when CAM2 energy model is used. This causes most of camera HAL threads scheduled on big cluster only with CAM2 EM profile. Lowering CAM uclamp min so it is within MID clusters capacity for both energe model Flag: EXEMPT tuning changes Test: check camera trace with proper uclamp value Bug: 350629738 Change-Id: I40ce59d0a0d99ea6ba016a24245f44713485bc52 --- perf/powerhint-husky.json | 6 +++--- perf/powerhint-ripcurrent.json | 6 +++--- perf/powerhint-shiba.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index fd71402..6641a3f 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -315,7 +315,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ - "765", + "720", "250", "0" ], @@ -1371,7 +1371,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1485,7 +1485,7 @@ "PowerHint": "CAMERA_SHOT", "Node": "CAMUClampBoost", "Duration": 100, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_BACKEND_BOOST", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index e91061c..5e84b1a 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -301,7 +301,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ - "765", + "720", "250", "0" ], @@ -1347,7 +1347,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1443,7 +1443,7 @@ "PowerHint": "CAMERA_SHOT", "Node": "CAMUClampBoost", "Duration": 100, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_BACKEND_BOOST", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 2a45ff0..6d2ba53 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -315,7 +315,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ - "765", + "720", "250", "0" ], @@ -1377,7 +1377,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1491,7 +1491,7 @@ "PowerHint": "CAMERA_SHOT", "Node": "CAMUClampBoost", "Duration": 100, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_BACKEND_BOOST", From c3e76e51faa568589032336caa39f57aa0a7065d Mon Sep 17 00:00:00 2001 From: Mostafa Saleh Date: Sat, 27 Jul 2024 21:46:07 +0000 Subject: [PATCH 44/74] shiba: Remove AVF assignable devices This should be in experimental. Bug: 352009226 Bug: 349571564 Flag: EXEMPT experimental code Change-Id: I712caa712286c9625ca22983ba55395f08d7f22d Signed-off-by: Mostafa Saleh --- avf/Android.bp | 22 ---------------------- avf/assignable_devices.xml | 22 ---------------------- device-husky.mk | 3 --- device-shiba.mk | 3 --- 4 files changed, 50 deletions(-) delete mode 100644 avf/Android.bp delete mode 100644 avf/assignable_devices.xml diff --git a/avf/Android.bp b/avf/Android.bp deleted file mode 100644 index d707db1..0000000 --- a/avf/Android.bp +++ /dev/null @@ -1,22 +0,0 @@ -// -// 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. - -prebuilt_etc { - name: "shusky_assignable_devices.xml", - src: "assignable_devices.xml", - filename: "assignable_devices.xml", - vendor: true, - relative_install_path: "avf", -} diff --git a/avf/assignable_devices.xml b/avf/assignable_devices.xml deleted file mode 100644 index baacffc..0000000 --- a/avf/assignable_devices.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - eh - eh - /sys/bus/platform/devices/16d00000.eh - - diff --git a/device-husky.mk b/device-husky.mk index a2e4c36..9880c06 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -462,9 +462,6 @@ PRODUCT_PRODUCT_PROPERTIES ?= \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true -# AVF assignable devices xml -PRODUCT_PACKAGES += shusky_assignable_devices.xml - # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true diff --git a/device-shiba.mk b/device-shiba.mk index 838ee76..a50d77e 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -431,9 +431,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true -# AVF assignable devices xml -PRODUCT_PACKAGES += shusky_assignable_devices.xml - # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true From 9e2e0835ec6d87521a7ac73af3be4629a3ba8363 Mon Sep 17 00:00:00 2001 From: Shreshta Manu Date: Wed, 14 Aug 2024 18:41:45 +0000 Subject: [PATCH 45/74] [uwb] enable multicast update rsp v2 Test: atest CtsUwbTestCases Bug: 359665219 Flag: EXEMPT overlay update Change-Id: I65300ef6be669568ee2d63a28d189ef00a63402d --- husky/rro_overlays/UwbOverlay/res/values/config.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/husky/rro_overlays/UwbOverlay/res/values/config.xml b/husky/rro_overlays/UwbOverlay/res/values/config.xml index 622018d..a1d0fda 100644 --- a/husky/rro_overlays/UwbOverlay/res/values/config.xml +++ b/husky/rro_overlays/UwbOverlay/res/values/config.xml @@ -34,4 +34,8 @@ true + + + true From 54d9a67640ea0781b73346ec909432d386781ef6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Aug 2024 23:19:42 +0000 Subject: [PATCH 46/74] Update shiba SVN to 36 Bug: 352170103 Change-Id: I407ec18b0edfb410e6df0b6b4bf1d57f1bf7ff18 Flag: EXEMPT bugfix --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index a6b6093..1de38f7 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -383,7 +383,7 @@ ifdef RELEASE_SVN_SHIBA TARGET_SVN ?= $(RELEASE_SVN_SHIBA) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 35 +TARGET_SVN ?= 36 endif PRODUCT_VENDOR_PROPERTIES += \ From 5b4b08ce53549d3158f81356491af4f70cc514d5 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Aug 2024 23:21:35 +0000 Subject: [PATCH 47/74] Update shiba SVN to 37 Bug: 352170103 Change-Id: I0fd5f194fcb5d529fcbba4dfa524b23e24fb35e1 Flag: EXEMPT bugfix --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 1de38f7..63eef31 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -383,7 +383,7 @@ ifdef RELEASE_SVN_SHIBA TARGET_SVN ?= $(RELEASE_SVN_SHIBA) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 36 +TARGET_SVN ?= 37 endif PRODUCT_VENDOR_PROPERTIES += \ From 90b564e7c1c1fe1696765682dcb608777fb9e6c2 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Aug 2024 23:23:03 +0000 Subject: [PATCH 48/74] Update shiba SVN to 38 Bug: 352170103 Change-Id: Ib060e30902cdd06922abf36158e44b958a9f8412 Flag: EXEMPT bugfix --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 63eef31..9ece02e 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -383,7 +383,7 @@ ifdef RELEASE_SVN_SHIBA TARGET_SVN ?= $(RELEASE_SVN_SHIBA) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 37 +TARGET_SVN ?= 38 endif PRODUCT_VENDOR_PROPERTIES += \ From 900ef331c95b4cb608083a217317a8a084e0f8e6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Aug 2024 23:24:35 +0000 Subject: [PATCH 49/74] Update husky SVN to 36 Bug: 352170103 Change-Id: I60133f5949a5b7598af6d29181c61a5fca78edc7 Flag: EXEMPT bugfix --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 1c1e3b0..e5b41c6 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -406,7 +406,7 @@ ifdef RELEASE_SVN_HUSKY TARGET_SVN ?= $(RELEASE_SVN_HUSKY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 35 +TARGET_SVN ?= 36 endif PRODUCT_VENDOR_PROPERTIES += \ From cadf33866670e536b9d30f675c153fb6341d3f14 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Aug 2024 23:28:00 +0000 Subject: [PATCH 50/74] Update husky SVN to 37 Bug: 352170103 Change-Id: I8ae5e6aba99c0d737a571d5d21f9361402c552e5 Flag: EXEMPT bugfix --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index e5b41c6..28e6ef0 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -406,7 +406,7 @@ ifdef RELEASE_SVN_HUSKY TARGET_SVN ?= $(RELEASE_SVN_HUSKY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 36 +TARGET_SVN ?= 37 endif PRODUCT_VENDOR_PROPERTIES += \ From c2adbb97e3c6f5fbb1acb8e651ef6c4757cbb24b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Aug 2024 23:29:47 +0000 Subject: [PATCH 51/74] Update husky SVN to 38 Bug: 352170103 Change-Id: I9d1a7d585cb5e7cbe8916532af93ed6acd98b135 Flag: EXEMPT bugfix --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 28e6ef0..26b060c 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -406,7 +406,7 @@ ifdef RELEASE_SVN_HUSKY TARGET_SVN ?= $(RELEASE_SVN_HUSKY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 37 +TARGET_SVN ?= 38 endif PRODUCT_VENDOR_PROPERTIES += \ From cc6945daba7659b375e5229e011e200bd1154b50 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Wed, 14 Aug 2024 08:33:28 +0000 Subject: [PATCH 52/74] thermal:remove unused state2power value Bug: 355566259 Test: Build test Flag: EXEMPT NDK Change-Id: If0820929e5346a210d5a55f210b5aa86035fd155 Signed-off-by: Peter (YM) --- thermal/thermal_info_config_ripcurrent.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/thermal/thermal_info_config_ripcurrent.json b/thermal/thermal_info_config_ripcurrent.json index 45d2f36..0e9c3e9 100644 --- a/thermal/thermal_info_config_ripcurrent.json +++ b/thermal/thermal_info_config_ripcurrent.json @@ -305,20 +305,17 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["1100", "1050", "1000", "950", "900", "850", "800", "750", "700", "650", "600"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["1450", "1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, { "Name":"thermal-gpufreq-0", From 0febe5ef59d15546d26f7564293751fee0665f40 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Fri, 16 Aug 2024 06:49:43 +0000 Subject: [PATCH 53/74] thermal: read thermistor temp from sysfs - avoid wrong sensor value reading for thermalHAL Bug: 327327502 Test: Build to boot to home Flag: EXEMPT (bug 337358613) Change-Id: I0a583f2f921d29265fef783538dd9c7ea291d794 Signed-off-by: Peter (YM) --- thermal/thermal_info_config_charge_husky.json | 8 -------- thermal/thermal_info_config_charge_shiba.json | 8 -------- thermal/thermal_info_config_husky.json | 8 -------- thermal/thermal_info_config_shiba.json | 8 -------- 4 files changed, 32 deletions(-) diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index 6212234..66b949d 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 32.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 33.7, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 47.2, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 48.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 31.7, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 44.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 34.6, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json index 539bcef..25fa05d 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 38.8, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 31.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 41.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 42.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 31.2, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 41.5, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 35.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 41fc3ba..9864834 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 32.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 33.7, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 47.2, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 48.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 31.7, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 44.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 34.6, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index a6bc952..ebf4c9e 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 38.8, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 31.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 41.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 42.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 31.2, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 41.5, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 35.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 From 3edf043146d0e8451449ff063c09ba25956f1f03 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Mon, 12 Aug 2024 17:22:51 +0800 Subject: [PATCH 54/74] gps: add CpEarlyFixGuardTimeSec to prevent earlyfix response delay Bug: 358041425 Test: verify pass Change-Id: Id7ca5b55b05b820a73ec149628a3519008da6b6b --- location/gps.6.1.xml.hk3 | 1 + location/gps.6.1.xml.sb3 | 1 + location/gps.xml | 1 + location/gps.xml.hk3 | 1 + location/gps.xml.sb3 | 1 + location/gps_user.6.1.xml.hk3 | 1 + location/gps_user.6.1.xml.sb3 | 1 + location/gps_user.xml | 1 + location/gps_user.xml.hk3 | 1 + location/gps_user.xml.sb3 | 1 + 10 files changed, 10 insertions(+) diff --git a/location/gps.6.1.xml.hk3 b/location/gps.6.1.xml.hk3 index 20329db..5a56e66 100644 --- a/location/gps.6.1.xml.hk3 +++ b/location/gps.6.1.xml.hk3 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" diff --git a/location/gps.6.1.xml.sb3 b/location/gps.6.1.xml.sb3 index a848fd9..7887854 100644 --- a/location/gps.6.1.xml.sb3 +++ b/location/gps.6.1.xml.sb3 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml b/location/gps.xml index 7441f38..13d54d3 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3 index b238f9b..f58dc85 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3 index 1abf8e2..4cc5731 100644 --- a/location/gps.xml.sb3 +++ b/location/gps.xml.sb3 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.6.1.xml.hk3 b/location/gps_user.6.1.xml.hk3 index a6ddbce..2508944 100644 --- a/location/gps_user.6.1.xml.hk3 +++ b/location/gps_user.6.1.xml.hk3 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.6.1.xml.sb3 b/location/gps_user.6.1.xml.sb3 index 4248a7b..2b05b75 100644 --- a/location/gps_user.6.1.xml.sb3 +++ b/location/gps_user.6.1.xml.sb3 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 292fa2b..cd0892d 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3 index 3a0f045..2cf294d 100644 --- a/location/gps_user.xml.hk3 +++ b/location/gps_user.xml.hk3 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3 index 463fd07..c19e4b3 100644 --- a/location/gps_user.xml.sb3 +++ b/location/gps_user.xml.sb3 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" From 70363dbbfa08da53cf9eb5605b0d8b0618a8f42f Mon Sep 17 00:00:00 2001 From: Paulsu Su Date: Thu, 22 Aug 2024 02:32:49 +0000 Subject: [PATCH 55/74] Update mismatched frequency for husky and shiba - Update freq for legacy mismatched frequency with the rule of scaling_max_freq will automatically round down, scaling_min_freq will round up. All powerhint behavior should not change. - Remove some min/max frequency not used in any nodes. Bug: 361294204 FLAG: NONE powerhint do not need flag Change-Id: I0242977f05f859ad5c3c38673579e296e74c78ca --- perf/powerhint-husky.json | 62 +++++++++++++++++---------------------- perf/powerhint-shiba.json | 62 +++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 70 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index f464ced..fab84f0 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -81,8 +81,8 @@ "Values": [ "9999999", "1098000", - "1475000", - "975000", + "1425000", + "955000", "1197000", "1328000", "1548000", @@ -96,7 +96,7 @@ "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", "Values": [ "9999999", - "1475000", + "1548000", "1197000", "0" ], @@ -120,14 +120,11 @@ "9999999", "2253000", "2130000", - "1082000", - "1221000", - "1418000", "910000", "1328000", - "1622000", + "1572000", "1836000", - "1999000" + "1945000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -140,7 +137,6 @@ "2253000", "2130000", "1836000", - "1221000", "0" ], "ResetOnInit": true @@ -165,14 +161,11 @@ "2704000", "2507000", "2252000", - "893000", - "1328000", - "1852000", - "1164000", + "1298000", "1557000", "1745000", "2049000", - "2409000" + "2363000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -185,8 +178,7 @@ "2704000", "2507000", "2252000", - "1852000", - "1164000", + "1885000", "0" ], "ResetOnInit": true @@ -737,7 +729,7 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency", "Values": [ "2363000", - "1852000", + "1745000", "1298000" ], "DefaultIndex": 0 @@ -1341,7 +1333,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CPUBigClusterMinFreq", "Duration": 1000, - "Value": "1852000" + "Value": "1885000" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1365,7 +1357,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CPULittleClusterMinFreq", "Duration": 1000, - "Value": "1475000" + "Value": "1548000" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1455,19 +1447,19 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 3000, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", "Duration": 3000, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -2253,19 +2245,19 @@ "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_STREAMING_LOW", @@ -2525,7 +2517,7 @@ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", "Node": "CPULittleClusterMaxFreq", "Duration": 3600000, - "Value": "975000" + "Value": "955000" }, { "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60", @@ -2567,7 +2559,7 @@ "PowerHint": "LOW_POWER_MID_CLUSTER_70", "Node": "CPUMidClusterMaxFreq", "Duration": 3600000, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "LOW_POWER_MID_CLUSTER_80", @@ -2579,13 +2571,13 @@ "PowerHint": "LOW_POWER_MID_CLUSTER_90", "Node": "CPUMidClusterMaxFreq", "Duration": 3600000, - "Value": "1999000" + "Value": "1945000" }, { "PowerHint": "LOW_POWER_CPU_50", "Node": "CPUBigClusterMaxFreq", "Duration": 3600000, - "Value": "1328000" + "Value": "1298000" }, { "PowerHint": "LOW_POWER_CPU_60", @@ -2609,7 +2601,7 @@ "PowerHint": "LOW_POWER_CPU_90", "Node": "CPUBigClusterMaxFreq", "Duration": 3600000, - "Value": "2409000" + "Value": "2363000" }, { "PowerHint": "LOW_POWER", @@ -2890,7 +2882,7 @@ "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMinFreq", "Duration": 500, - "Value": "1852000" + "Value": "1885000" }, { "PowerHint": "FACE_UNLOCK_BOOST", @@ -2992,7 +2984,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_BIG_LIMIT_FREQ", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_PROJECT11", @@ -3040,19 +3032,19 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_PROJECT11", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 26f7ea9..8ed56c4 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -81,8 +81,8 @@ "Values": [ "9999999", "1098000", - "1475000", - "975000", + "1425000", + "955000", "1197000", "1328000", "1548000", @@ -96,7 +96,7 @@ "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", "Values": [ "9999999", - "1475000", + "1548000", "1197000", "0" ], @@ -118,14 +118,11 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Values": [ "9999999", - "1082000", - "1221000", - "1418000", "910000", "1328000", - "1622000", + "1572000", "1836000", - "1999000" + "1945000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -136,7 +133,6 @@ "Values": [ "9999999", "1836000", - "1221000", "0" ], "ResetOnInit": true @@ -158,14 +154,11 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq", "Values": [ "9999999", - "893000", - "1328000", - "1852000", - "1164000", + "1298000", "1557000", "1745000", "2049000", - "2409000" + "2363000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -175,8 +168,7 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq", "Values": [ "9999999", - "1852000", - "1164000", + "1885000", "0" ], "ResetOnInit": true @@ -737,7 +729,7 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency", "Values": [ "2363000", - "1852000", + "1745000", "1298000" ], "DefaultIndex": 0 @@ -1347,7 +1339,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CPUBigClusterMinFreq", "Duration": 1000, - "Value": "1852000" + "Value": "1885000" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1371,7 +1363,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CPULittleClusterMinFreq", "Duration": 1000, - "Value": "1475000" + "Value": "1548000" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1461,19 +1453,19 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 3000, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", "Duration": 3000, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -2151,19 +2143,19 @@ "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_STREAMING_LOW", @@ -2429,7 +2421,7 @@ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", "Node": "CPULittleClusterMaxFreq", "Duration": 3600000, - "Value": "975000" + "Value": "955000" }, { "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60", @@ -2471,7 +2463,7 @@ "PowerHint": "LOW_POWER_MID_CLUSTER_70", "Node": "CPUMidClusterMaxFreq", "Duration": 3600000, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "LOW_POWER_MID_CLUSTER_80", @@ -2483,13 +2475,13 @@ "PowerHint": "LOW_POWER_MID_CLUSTER_90", "Node": "CPUMidClusterMaxFreq", "Duration": 3600000, - "Value": "1999000" + "Value": "1945000" }, { "PowerHint": "LOW_POWER_CPU_50", "Node": "CPUBigClusterMaxFreq", "Duration": 3600000, - "Value": "1328000" + "Value": "1298000" }, { "PowerHint": "LOW_POWER_CPU_60", @@ -2513,7 +2505,7 @@ "PowerHint": "LOW_POWER_CPU_90", "Node": "CPUBigClusterMaxFreq", "Duration": 3600000, - "Value": "2409000" + "Value": "2363000" }, { "PowerHint": "LOW_POWER", @@ -2794,7 +2786,7 @@ "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMinFreq", "Duration": 500, - "Value": "1852000" + "Value": "1885000" }, { "PowerHint": "FACE_UNLOCK_BOOST", @@ -2896,7 +2888,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_BIG_LIMIT_FREQ", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_PROJECT11", @@ -2944,19 +2936,19 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_PROJECT11", From 6c73ef923d66f03790b8faf6950de215768ba38f Mon Sep 17 00:00:00 2001 From: Gaurav Sarode Date: Wed, 21 Aug 2024 09:20:08 -0700 Subject: [PATCH 56/74] Fix the husky_car target path bug: 361168394 Flag: EXEMPT bugfix Test: local build and flash Change-Id: Ia0504cc622ffd5d528056e94436f5b80deea8812 --- husky/BoardConfig.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index f387ff9..76c6b79 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -33,9 +33,9 @@ RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ $(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)) ifdef PHONE_CAR_BOARD_PRODUCT - include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk + include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else - TARGET_SCREEN_DENSITY := 480 + TARGET_SCREEN_DENSITY := 480 endif BOARD_USES_GENERIC_AUDIO := true From 23497f924443739654ec5e805915b9a53b0110ba Mon Sep 17 00:00:00 2001 From: millerliang Date: Sat, 24 Aug 2024 08:33:03 +0000 Subject: [PATCH 57/74] audio: fix the noise of raw-playback in 16kB page mode To fix the noise of raw-playback in 16KB page mode, we change to use non-mmaped mode. Bug: 355285548 Flag: EXEMPT : bugfix Test: Local test, ABTD Change-Id: I21cca03b5ceff10c014675bd2465d5fc051e8250 --- audio/husky/config/audio_platform_configuration.xml | 4 ++-- audio/shiba/config/audio_platform_configuration.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml index 3c403c1..0c72f93 100644 --- a/audio/husky/config/audio_platform_configuration.xml +++ b/audio/husky/config/audio_platform_configuration.xml @@ -173,8 +173,8 @@ - - + + diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml index 3c403c1..0c72f93 100644 --- a/audio/shiba/config/audio_platform_configuration.xml +++ b/audio/shiba/config/audio_platform_configuration.xml @@ -173,8 +173,8 @@ - - + + From 6391431d8965c8df3bf74a3cc471a480015cf9e1 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Thu, 1 Aug 2024 09:18:18 +0000 Subject: [PATCH 58/74] gps: Re-enable GLO & QZSS in US Test: on-device Bug: 353579502 Change-Id: I9186c0cd69e61c9e2a772e47531e7626c91fdaa4 --- location/gps.6.1.xml.hk3 | 2 ++ location/gps.6.1.xml.sb3 | 2 ++ location/gps.xml.hk3 | 2 ++ location/gps.xml.sb3 | 2 ++ location/gps_user.6.1.xml.hk3 | 2 ++ location/gps_user.6.1.xml.sb3 | 2 ++ location/gps_user.xml | 2 ++ location/gps_user.xml.hk3 | 2 ++ location/gps_user.xml.sb3 | 2 ++ 9 files changed, 18 insertions(+) diff --git a/location/gps.6.1.xml.hk3 b/location/gps.6.1.xml.hk3 index 20329db..cf2fceb 100644 --- a/location/gps.6.1.xml.hk3 +++ b/location/gps.6.1.xml.hk3 @@ -101,6 +101,8 @@ /> diff --git a/location/gps.6.1.xml.sb3 b/location/gps.6.1.xml.sb3 index a848fd9..cf01e15 100644 --- a/location/gps.6.1.xml.sb3 +++ b/location/gps.6.1.xml.sb3 @@ -101,6 +101,8 @@ /> diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3 index b238f9b..1b2566e 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -99,6 +99,8 @@ /> diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3 index 1abf8e2..1647b50 100644 --- a/location/gps.xml.sb3 +++ b/location/gps.xml.sb3 @@ -99,6 +99,8 @@ /> diff --git a/location/gps_user.6.1.xml.hk3 b/location/gps_user.6.1.xml.hk3 index a6ddbce..a1d9fde 100644 --- a/location/gps_user.6.1.xml.hk3 +++ b/location/gps_user.6.1.xml.hk3 @@ -99,6 +99,8 @@ /> diff --git a/location/gps_user.6.1.xml.sb3 b/location/gps_user.6.1.xml.sb3 index 4248a7b..6ee10ee 100644 --- a/location/gps_user.6.1.xml.sb3 +++ b/location/gps_user.6.1.xml.sb3 @@ -99,6 +99,8 @@ /> diff --git a/location/gps_user.xml b/location/gps_user.xml index 292fa2b..b0f0218 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -97,6 +97,8 @@ /> diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3 index 3a0f045..38f7f47 100644 --- a/location/gps_user.xml.hk3 +++ b/location/gps_user.xml.hk3 @@ -97,6 +97,8 @@ /> diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3 index 463fd07..e065de1 100644 --- a/location/gps_user.xml.sb3 +++ b/location/gps_user.xml.sb3 @@ -97,6 +97,8 @@ /> From c36d7a7972b65d637c084d7051de92c1cd4aecd7 Mon Sep 17 00:00:00 2001 From: Pindar Yang Date: Mon, 26 Aug 2024 05:54:06 +0000 Subject: [PATCH 59/74] Switch bootloader and radio directory to control by build flag Flag: build.RELEASE_GOOGLE_PRODUCT_RADIO_DIR, build.RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR, build.RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR Bug: 361226755 Change-Id: I093090da431f7a8daa15fffbd5ffe372ef2c8fa4 Signed-off-by: Pindar Yang --- device-husky.mk | 11 +++++++++++ device-ripcurrent.mk | 5 +++++ device-shiba.mk | 11 +++++++++++ husky/BoardConfig.mk | 6 ------ ripcurrent/BoardConfig.mk | 4 ---- shiba/BoardConfig.mk | 6 ------ 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 706f3e0..3954b89 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -17,6 +17,17 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_HUSKY_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR) +$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_HUSKY_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_HUSKY_DIR) diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index a399216..9d81cf0 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -17,6 +17,11 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR) +$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RIPCURRENT_VERSION) TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RIPCURRENT_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RIPCURRENT_DIR)/kernel-headers diff --git a/device-shiba.mk b/device-shiba.mk index e052cd4..276a933 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -17,6 +17,17 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_SHIBA_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_SHIBA_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_SHIBA_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR) +$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_SHIBA_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_SHIBA_DIR) diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 76c6b79..63ef483 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -26,12 +26,6 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := husky -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) -RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR) -$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)) - ifdef PHONE_CAR_BOARD_PRODUCT include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index 76f2b5d..a84d4b0 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -27,10 +27,6 @@ TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_SHUSKY := true -RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR) -$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)) - include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 8a5fb4b..30d204e 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -26,12 +26,6 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := shiba -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) -RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR) -$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)) - ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else From 54c0accb7fbca10638f0f93a41cd3abb360a9049 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Fri, 24 May 2024 13:45:23 +0000 Subject: [PATCH 60/74] Set big core to group_cfs_skip_mask for sys group by default Let sys group tasks will run less in big core by default. Bug: 328210236 Test: build pass Change-Id: I0092c5d32091894750287fb1fb0c5756158d37b1 --- perf/powerhint-husky.json | 9 +++++++++ perf/powerhint-ripcurrent.json | 9 +++++++++ perf/powerhint-shiba.json | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index f464ced..50a14b6 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -466,6 +466,15 @@ ], "ResetOnInit": true }, + { + "Name": "SysGroupCfsSkipMask", + "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", + "Values": [ + "0x0", + "0x80" + ], + "ResetOnInit": true + }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 1f2ae91..c1fd03c 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -452,6 +452,15 @@ ], "ResetOnInit": true }, + { + "Name": "SysGroupCfsSkipMask", + "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", + "Values": [ + "0x0", + "0x80" + ], + "ResetOnInit": true + }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 26f7ea9..c27e274 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -466,6 +466,15 @@ ], "ResetOnInit": true }, + { + "Name": "SysGroupCfsSkipMask", + "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", + "Values": [ + "0x0", + "0x80" + ], + "ResetOnInit": true + }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", From a2b661cfc15be226edcbcda329b38e8c7fa9178f Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 27 Aug 2024 15:04:37 +0000 Subject: [PATCH 61/74] Enable auto prefer idle Also disable prefer idle for TA and FG by default. Bug: 236868627 Flag: NONE powerhint change does not support flags Test: build pass Change-Id: I0d06e707900ec9a85decbdecbd184532743c7de0 --- perf/powerhint-husky.json | 3 --- perf/powerhint-ripcurrent.json | 3 --- perf/powerhint-shiba.json | 3 --- 3 files changed, 9 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index f464ced..6adab31 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -228,7 +228,6 @@ "0", "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -436,7 +435,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -473,7 +471,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 1f2ae91..5702708 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -214,7 +214,6 @@ "0", "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -422,7 +421,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -459,7 +457,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 26f7ea9..43ec6aa 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -218,7 +218,6 @@ "0", "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -436,7 +435,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -473,7 +471,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { From 80d1365e54f3806dda8042b409aabf912717ece5 Mon Sep 17 00:00:00 2001 From: JJ Lee Date: Wed, 3 Jul 2024 16:33:30 +0800 Subject: [PATCH 62/74] audio: power optimization for deepbuffer playback Bug: 249436330 Test: build pass, cts pass, regression test pass Flag: EXEMPT bugfix Change-Id: Iacf4ad1ade7148491b24e7bd0f1e423f0a6d34de Signed-off-by: JJ Lee --- audio/husky/config/audio_platform_configuration.xml | 4 ++-- audio/ripcurrent/config/audio_platform_configuration.xml | 4 ++-- audio/shiba/config/audio_platform_configuration.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml index 3c403c1..9b28124 100644 --- a/audio/husky/config/audio_platform_configuration.xml +++ b/audio/husky/config/audio_platform_configuration.xml @@ -179,8 +179,8 @@ - - + + diff --git a/audio/ripcurrent/config/audio_platform_configuration.xml b/audio/ripcurrent/config/audio_platform_configuration.xml index 2435e98..4748e6f 100644 --- a/audio/ripcurrent/config/audio_platform_configuration.xml +++ b/audio/ripcurrent/config/audio_platform_configuration.xml @@ -179,8 +179,8 @@ - - + + diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml index 3c403c1..9b28124 100644 --- a/audio/shiba/config/audio_platform_configuration.xml +++ b/audio/shiba/config/audio_platform_configuration.xml @@ -179,8 +179,8 @@ - - + + From e295a3ae54597a0e2e97fb0466d5c51e1566bd8b Mon Sep 17 00:00:00 2001 From: Hana Huang Date: Thu, 8 Aug 2024 14:03:19 +0000 Subject: [PATCH 63/74] Update estimated WiFi power consumption value Bug: 351925447 Test: Wifi Regression Test Flag: EXEMPT overlay update Change-Id: I2b4badc92df027d366e9f3b21b6eb0c17022ad42 Signed-off-by: Hana Huang --- .../frameworks/base/core/res/res/xml/power_profile.xml | 8 ++++---- .../frameworks/base/core/res/res/xml/power_profile.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 5f36d8c..0680f65 100644 --- a/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -188,11 +188,11 @@ 3700 - 79 + 38 - 118 + 57 - 331 + 550 - 3700 + 3850 diff --git a/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 5f36d8c..0680f65 100644 --- a/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -188,11 +188,11 @@ 3700 - 79 + 38 - 118 + 57 - 331 + 550 - 3700 + 3850 From 6041d91a969dff6d5e4d44376e592f8620306311 Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 28 Aug 2024 22:55:29 -0700 Subject: [PATCH 64/74] Delete mapper4 manifest Bug: 362183626 Flag: EXEMPT manifest update Test: Boot to home on shiba Change-Id: Ic4fb66eebda66173aa8186d96f2b1dbd9ea33ad8 --- manifest.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest.xml b/manifest.xml index e01d156..18109c6 100644 --- a/manifest.xml +++ b/manifest.xml @@ -48,15 +48,6 @@ default - - android.hardware.graphics.mapper - passthrough - 4.0 - - IMapper - default - - android.hardware.graphics.composer hwbinder From e2a796691da7a51bb40e31e35449fde71543a4e4 Mon Sep 17 00:00:00 2001 From: Paulsu Su Date: Sat, 31 Aug 2024 05:20:01 +0000 Subject: [PATCH 65/74] powerhint: Update not available frequency to reflect its actual behavior Some frequencies uses unavailable frequency other soc ex: ag/22293847, the patch update them to explicitly show the actual actions of driver. Bug: 361294204 Change-Id: I1adc41aca636650b4eaad179d73bde030146347c FLAG: NONE powerhint do not need flag --- perf/powerhint-husky.json | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index fab84f0..1cf6e87 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -118,7 +118,7 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Values": [ "9999999", - "2253000", + "2245000", "2130000", "910000", "1328000", @@ -134,7 +134,7 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", "Values": [ "9999999", - "2253000", + "2245000", "2130000", "1836000", "0" @@ -158,9 +158,8 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq", "Values": [ "9999999", - "2704000", - "2507000", - "2252000", + "2687000", + "2147000", "1298000", "1557000", "1745000", @@ -175,9 +174,9 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq", "Values": [ "9999999", - "2704000", - "2507000", - "2252000", + "2687000", + "2363000", + "2147000", "1885000", "0" ], @@ -1531,13 +1530,13 @@ "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "2704000" + "Value": "2687000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "CPUBigClusterMinFreq", "Duration": 3000, - "Value": "2704000" + "Value": "2687000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2", @@ -1549,13 +1548,13 @@ "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "2507000" + "Value": "2363000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2", "Node": "CPUBigClusterMinFreq", "Duration": 3000, - "Value": "2507000" + "Value": "2363000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3", @@ -1567,13 +1566,13 @@ "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "2252000" + "Value": "2147000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3", "Node": "CPUBigClusterMinFreq", "Duration": 3000, - "Value": "2252000" + "Value": "2147000" }, { "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK1", @@ -1591,13 +1590,13 @@ "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2", "Node": "CPUMidClusterMaxFreq", "Duration": 3000, - "Value": "2253000" + "Value": "2245000" }, { "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2", "Node": "CPUMidClusterMinFreq", "Duration": 3000, - "Value": "2253000" + "Value": "2245000" }, { "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK3", From 29af2213b34ee2a9a22e86ea10ad5b721658c096 Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 29 Aug 2024 09:48:19 +0000 Subject: [PATCH 66/74] audio: update AIDL configs and add spatializer configs Bug: 362904466 Test: mm Flag: build.RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA Change-Id: I24d380399882023a63d8c651bad3fee2eb4f8240 --- .../audio_platform_configuration.xml | 19 +- audio/husky/aidl_config/mixer_paths_aidl.xml | 424 +++++++++--------- audio/husky/audio-tables.mk | 10 + audio/husky/tuning/spatializer/base | Bin 0 -> 3912 bytes audio/husky/tuning/spatializer/mode_2_ch | Bin 0 -> 916 bytes audio/husky/tuning/spatializer/mode_6_ch | Bin 0 -> 784 bytes audio/husky/tuning/spatializer/mode_xaural | Bin 0 -> 32 bytes .../audio_platform_configuration.xml | 19 +- audio/shiba/aidl_config/mixer_paths_aidl.xml | 424 +++++++++--------- audio/shiba/audio-tables.mk | 10 + audio/shiba/tuning/spatializer/base | Bin 0 -> 3912 bytes audio/shiba/tuning/spatializer/mode_2_ch | Bin 0 -> 916 bytes audio/shiba/tuning/spatializer/mode_6_ch | Bin 0 -> 784 bytes audio/shiba/tuning/spatializer/mode_xaural | Bin 0 -> 32 bytes device-husky.mk | 20 +- device-shiba.mk | 20 +- 16 files changed, 496 insertions(+), 450 deletions(-) create mode 100644 audio/husky/tuning/spatializer/base create mode 100644 audio/husky/tuning/spatializer/mode_2_ch create mode 100644 audio/husky/tuning/spatializer/mode_6_ch create mode 100644 audio/husky/tuning/spatializer/mode_xaural create mode 100644 audio/shiba/tuning/spatializer/base create mode 100644 audio/shiba/tuning/spatializer/mode_2_ch create mode 100644 audio/shiba/tuning/spatializer/mode_6_ch create mode 100644 audio/shiba/tuning/spatializer/mode_xaural diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml index 4b747bb..b34566d 100644 --- a/audio/husky/aidl_config/audio_platform_configuration.xml +++ b/audio/husky/aidl_config/audio_platform_configuration.xml @@ -24,10 +24,13 @@ - + - + + + + @@ -47,7 +50,6 @@ - @@ -58,11 +60,12 @@ - + + @@ -71,8 +74,8 @@ - - + + @@ -89,18 +92,18 @@ + + MIC CAMCORDER - VOICE_RECOGNITION MIC CAMCORDER - VOICE_RECOGNITION diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index 9695f70..9c8ccf6 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -256,10 +256,14 @@ - + + + + + @@ -307,6 +311,7 @@ + @@ -413,6 +418,10 @@ + + + + @@ -485,6 +494,10 @@ + + + + @@ -557,6 +570,10 @@ + + + + @@ -634,6 +651,10 @@ + + + + @@ -706,6 +727,10 @@ + + + + @@ -790,6 +815,10 @@ + + + + @@ -806,61 +835,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -882,6 +856,18 @@ + + + + + + + + + + + + @@ -902,6 +888,10 @@ + + + + @@ -972,6 +962,10 @@ + + + + @@ -1046,6 +1040,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1074,11 +1101,47 @@ - + - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1113,6 +1176,10 @@ + + + + @@ -1165,77 +1232,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -1249,7 +1248,6 @@ - @@ -1266,7 +1264,6 @@ - @@ -1275,36 +1272,35 @@ - - - - + - + + + + + - - - - + + + + + - - - - + @@ -1316,91 +1312,47 @@ - - - - - + + - - - - - - + + - + + + + + + + + + + + - - - - - - - + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + @@ -1411,9 +1363,7 @@ - - - + @@ -1428,6 +1378,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index 1506b4e..0929972 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -82,3 +82,13 @@ PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps endif + +ifeq ($(USE_AUDIO_HAL_AIDL),true) +# Offload spatializer config +PRODUCT_COPY_FILES += \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \ + +endif diff --git a/audio/husky/tuning/spatializer/base b/audio/husky/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/husky/tuning/spatializer/mode_2_ch b/audio/husky/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/husky/tuning/spatializer/mode_6_ch b/audio/husky/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/husky/tuning/spatializer/mode_xaural b/audio/husky/tuning/spatializer/mode_xaural new file mode 100644 index 0000000000000000000000000000000000000000..b3a3a962e37c8aca8a8d1710f622c24f28343c56 GIT binary patch literal 32 dcmWe+U|^5{VipDm29d - + - + + + + @@ -47,7 +50,6 @@ - @@ -58,11 +60,12 @@ - + + @@ -71,8 +74,8 @@ - - + + @@ -89,18 +92,18 @@ + + MIC CAMCORDER - VOICE_RECOGNITION MIC CAMCORDER - VOICE_RECOGNITION diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index 9695f70..9c8ccf6 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -256,10 +256,14 @@ - + + + + + @@ -307,6 +311,7 @@ + @@ -413,6 +418,10 @@ + + + + @@ -485,6 +494,10 @@ + + + + @@ -557,6 +570,10 @@ + + + + @@ -634,6 +651,10 @@ + + + + @@ -706,6 +727,10 @@ + + + + @@ -790,6 +815,10 @@ + + + + @@ -806,61 +835,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -882,6 +856,18 @@ + + + + + + + + + + + + @@ -902,6 +888,10 @@ + + + + @@ -972,6 +962,10 @@ + + + + @@ -1046,6 +1040,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1074,11 +1101,47 @@ - + - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1113,6 +1176,10 @@ + + + + @@ -1165,77 +1232,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -1249,7 +1248,6 @@ - @@ -1266,7 +1264,6 @@ - @@ -1275,36 +1272,35 @@ - - - - + - + + + + + - - - - + + + + + - - - - + @@ -1316,91 +1312,47 @@ - - - - - + + - - - - - - + + - + + + + + + + + + + + - - - - - - - + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + @@ -1411,9 +1363,7 @@ - - - + @@ -1428,6 +1378,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index dd809ee..ea4aa77 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -82,3 +82,13 @@ PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps endif + +ifeq ($(USE_AUDIO_HAL_AIDL),true) +# Offload spatializer config +PRODUCT_COPY_FILES += \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \ + +endif diff --git a/audio/shiba/tuning/spatializer/base b/audio/shiba/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/shiba/tuning/spatializer/mode_2_ch b/audio/shiba/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/shiba/tuning/spatializer/mode_6_ch b/audio/shiba/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/shiba/tuning/spatializer/mode_xaural b/audio/shiba/tuning/spatializer/mode_xaural new file mode 100644 index 0000000000000000000000000000000000000000..b3a3a962e37c8aca8a8d1710f622c24f28343c56 GIT binary patch literal 32 dcmWe+U|^5{VipDm29d Date: Tue, 3 Sep 2024 09:07:08 +0000 Subject: [PATCH 67/74] Fix cpu mask for big core The big core mask on zuma should be 0x100. Bug: 248621289 Test: build pass Flag: NONE powerhint change does not support flags Change-Id: Id9dbd933505d3eaa2553ed1851883a3042028f16 --- perf/powerhint-husky.json | 4 ++-- perf/powerhint-ripcurrent.json | 4 ++-- perf/powerhint-shiba.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index e5c67c2..f5ca2ae 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -278,7 +278,7 @@ "Path": "/proc/vendor_sched/cpu_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, @@ -462,7 +462,7 @@ "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 4844ea3..41e06e7 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -273,7 +273,7 @@ "Path": "/proc/vendor_sched/cpu_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, @@ -457,7 +457,7 @@ "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index c3458e3..158f6fc 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -279,7 +279,7 @@ "Path": "/proc/vendor_sched/cpu_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, @@ -463,7 +463,7 @@ "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, From 50bfd1510395f1d3efc309f146ae516371c47b6c Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:36:46 +0000 Subject: [PATCH 68/74] Symlink current prebuilt folder to android root The Android are now based on Trunk Stable world and Pixel prebuilts CLs also needs to reply with this which controlled by the flag which results: - the flag value might be different on each branches - the flag value are mostly different on each release configuration - for local builds, ENGs' needs to figure out the correct location of current prebuilts by checking through entire prebuilt textproto files To alleviate this problem, create an symlink file under android root indicates current prebuilt path after invoke the android lunch cmd. Bug: 364831620 Flag: EXEMPT export current prebuilt path Change-Id: I9066437856338ef7da02be5648a119c1c38cc288 Signed-off-by: Robin Peng --- husky/BoardConfig.mk | 1 + ripcurrent/BoardConfig.mk | 1 + shiba/BoardConfig.mk | 1 + 3 files changed, 3 insertions(+) diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 63ef483..9240a13 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -45,6 +45,7 @@ include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/husky/proprietary/BoardConfigVendor.mk include device/google/shusky-sepolicy/husky-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index a84d4b0..142e21a 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -31,5 +31,6 @@ include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk include device/google/shusky-sepolicy/ripcurrent-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 30d204e..847a288 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -41,6 +41,7 @@ include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/shiba/proprietary/BoardConfigVendor.mk include device/google/shusky-sepolicy/shiba-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk From cc052744f183bc2e819c5c443a3551f9627644c7 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:19:12 +0000 Subject: [PATCH 69/74] Update product id for Shiba and Husky Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I5f8afb3ab826864884b3ba2cf27bd149efea3c2f --- device-husky.mk | 3 ++- device-shiba.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index c5c9057..40e1216 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -519,8 +519,9 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true # Bluetooth device id +# Husky: 0x410D PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20493 + bluetooth.device_id.product_id=16653 # Set support for LEA multicodec PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index 8d8d142..206e4a6 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -488,8 +488,9 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true # Bluetooth device id +# Shiba: 0x410E PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20492 + bluetooth.device_id.product_id=16654 # Set support for LEA multicodec PRODUCT_PRODUCT_PROPERTIES += \ From 106dbcf1d0260120d1a65345710099630f3a592c Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 19 Sep 2024 02:57:43 +0000 Subject: [PATCH 70/74] audio: add uninisialized mixer control Bug: 362904466 Test: mm Flag: build.RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA Change-Id: I29c18e1c6433aebfd4e8760ccb8f184708c41b06 --- audio/husky/aidl_config/mixer_paths_aidl.xml | 1 + audio/shiba/aidl_config/mixer_paths_aidl.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index 9c8ccf6..d970e8e 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -233,6 +233,7 @@ + diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index 9c8ccf6..d970e8e 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -233,6 +233,7 @@ + From 77a8ef39f76eb51fa0aed89686e77cca44e86465 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Thu, 19 Sep 2024 02:52:41 +0000 Subject: [PATCH 71/74] gps: Enable pulse-per-second feature Bug: 362710464 Flag: EXEMPT vendor configuration patch. Test: b/362710464 verified the GPS function and time synchronize. Change-Id: I6b7470db5d6f27f5a064ea8a7bd822b0a63b2b6e --- location/gps.xml.hk3 | 2 ++ location/gps.xml.sb3 | 2 ++ location/gps_user.xml.hk3 | 2 ++ location/gps_user.xml.sb3 | 2 ++ 4 files changed, 8 insertions(+) diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3 index 6ac9dd9..6421033 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -64,11 +64,13 @@ ReAidingOnHotStart="false" ReAidingIntervalSec="3600" RuntimeSwLteFilterEnable="true" + PpsDevice="/sys/devices/platform/bbd_pps/pps_assert" MaxThreadNum="13" SensorsMask="0x244" /> Date: Thu, 19 Sep 2024 14:52:50 +0800 Subject: [PATCH 72/74] Skip to check prebuilt max page size in PDK release Bug: 362618412 Flag: build.PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE Change-Id: I161445b265f0d500aac6d19355bc6ee274a805d3 --- device-husky.mk | 3 +++ device-shiba.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index bd97283..566ea2b 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -528,7 +528,10 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu endif PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true + +ifneq ($(wildcard vendor/arm/mali/valhall),) PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true +endif # Bluetooth device id # Husky: 0x410D diff --git a/device-shiba.mk b/device-shiba.mk index e5a6721..5cd1c6f 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -497,7 +497,10 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu endif PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true + +ifneq ($(wildcard vendor/arm/mali/valhall),) PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true +endif # Bluetooth device id # Shiba: 0x410E From 449e58e874a14603386b71b2fd4ebda568323ce6 Mon Sep 17 00:00:00 2001 From: Peter Lin Date: Fri, 20 Sep 2024 06:13:05 +0000 Subject: [PATCH 73/74] display: update reduceBrightColorsStrength setting Bug: 353768636 Test: dumpsys color_display Flag: NONE config update Change-Id: I977fa738050ae90d6f0cf7d0bb5d1f5a006ab696 --- .../frameworks/base/core/res/res/values/config.xml | 9 +++++++++ .../frameworks/base/core/res/res/values/config.xml | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml index c37151b..893d3ba 100644 --- a/husky/overlay/frameworks/base/core/res/res/values/config.xml +++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml @@ -32,6 +32,15 @@ 6 + + 35 + + + 25 + + + 50 + true diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml index 5128d0d..fcbbc46 100644 --- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml +++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml @@ -32,6 +32,15 @@ 6 + + 35 + + + 25 + + + 50 + 0.0 From e5364a3e491f5cc67a691e6ec0ed8c831e1aacad Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 23:12:44 +0800 Subject: [PATCH 74/74] gps: set default SUPL SSL method to SSLv23 Bug: 363886476 Test: verify SUPL NI test pass (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:11aaff62994134eda4f1329d1787a066418cdbcf) Merged-In: Ic19ff6af1a86f94853e8d2c65012ee247ae25bde Change-Id: Ic19ff6af1a86f94853e8d2c65012ee247ae25bde --- location/gps.6.1.xml.hk3 | 2 +- location/gps.6.1.xml.sb3 | 2 +- location/gps.xml | 2 +- location/gps.xml.hk3 | 2 +- location/gps.xml.sb3 | 2 +- location/gps_user.6.1.xml.hk3 | 2 +- location/gps_user.6.1.xml.sb3 | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.hk3 | 2 +- location/gps_user.xml.sb3 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/location/gps.6.1.xml.hk3 b/location/gps.6.1.xml.hk3 index b4a758f..a0f4913 100644 --- a/location/gps.6.1.xml.hk3 +++ b/location/gps.6.1.xml.hk3 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.6.1.xml.sb3 b/location/gps.6.1.xml.sb3 index 7e83262..5a7b48e 100644 --- a/location/gps.6.1.xml.sb3 +++ b/location/gps.6.1.xml.sb3 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml b/location/gps.xml index 13d54d3..4be8675 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3 index 6421033..9774534 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3 index d29bf7e..a31af5d 100644 --- a/location/gps.xml.sb3 +++ b/location/gps.xml.sb3 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.6.1.xml.hk3 b/location/gps_user.6.1.xml.hk3 index 34a3b23..b27f598 100644 --- a/location/gps_user.6.1.xml.hk3 +++ b/location/gps_user.6.1.xml.hk3 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.6.1.xml.sb3 b/location/gps_user.6.1.xml.sb3 index 4ae0f73..e715f27 100644 --- a/location/gps_user.6.1.xml.sb3 +++ b/location/gps_user.6.1.xml.sb3 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 97f881e..215973a 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3 index 2451057..e1fb9b9 100644 --- a/location/gps_user.xml.hk3 +++ b/location/gps_user.xml.hk3 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3 index 7968386..28bfb94 100644 --- a/location/gps_user.xml.sb3 +++ b/location/gps_user.xml.sb3 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true"