From 63ed988085638e223edd71a172282dfd213aa3e8 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 23 May 2024 21:44:55 +0000 Subject: [PATCH 01/53] 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 9c0b973e012e8a0de9b3094a573b2eeff93f0743 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 3 Apr 2024 18:57:52 +0000 Subject: [PATCH 02/53] 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 03/53] 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 d3ad2f99ce7c7b9957fda694d102b4d4e7a038cb Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Tue, 2 Jul 2024 11:13:44 -0700 Subject: [PATCH 04/53] 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 05/53] [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 06/53] 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 07/53] 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 08/53] 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 09/53] 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 10/53] 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 11/53] 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 12/53] 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 13/53] 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 14/53] 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 15/53] 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 16/53] 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 17/53] 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 df71f96653462c41c54a4c06df44169c6debe16e Mon Sep 17 00:00:00 2001 From: Hana Huang Date: Fri, 12 Jul 2024 05:57:06 +0000 Subject: [PATCH 18/53] Wifi: Disable config_wifiEnableStaIndoorChannelForPeerNetwork Bug: 351981809 Bug: 352658713 Test: AU drop/IFS/RvR/CTS/VTS/Manual Test, JP SAP indoor channel test Signed-off-by: Hana Huang (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:37b036a0ed8b956f77589654c3748ee6fbacedd1) Merged-In: If2d46e2bbd7612e6cc6f80bc74c7870dea17e08d Change-Id: If2d46e2bbd7612e6cc6f80bc74c7870dea17e08d --- 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 79c7ddf92e9b414f0ea7f5d21f4b1698eb3d05da Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 30 May 2024 00:09:10 +0000 Subject: [PATCH 19/53] Update husky SVN to 28 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1fd7be6ff6a4b00b907c7ef5096869938075e882) Merged-In: Iebe683d60093eecbf7aa8fb417c390e5180abfc9 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 8e123ae..5f5c9bc 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -396,7 +396,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 ae4c7015aee5e453d4318a53827d3c3516b0a4d3 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 30 May 2024 00:07:15 +0000 Subject: [PATCH 20/53] Update shiba SVN to 28 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dbbeb5592d7bcd71e20e50422375e7dbe4e3612d) Merged-In: Ib715c678925f017ef61b90b5331a705745ccd7ef 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 8da0637..268c78b 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -373,7 +373,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 baca27309910ea98fbbc8ebd82d2ed77dbe306a9 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 31 May 2024 18:20:52 +0000 Subject: [PATCH 21/53] Update husky SVN to 29 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a7d44dbb505092e6b99126ff5feb96cce9b8404c) Merged-In: I984a575909fd74ba78148bf39b5a109ecbf7bc3f 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 5f5c9bc..f199bd0 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -396,7 +396,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 255c9897da6c133c09b206e6006b6cdf3c360de5 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 31 May 2024 18:22:16 +0000 Subject: [PATCH 22/53] Update shiba SVN to 29 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d650a1559a58ababa3feaaea2a44e4b4f81f829a) Merged-In: Ie294dbfad34544b20386d019edf8d24819aa1f6d 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 268c78b..3037f30 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -373,7 +373,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 17bf01d638ade0592ebb5dfc1f39c236df90633e Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:08:32 +0000 Subject: [PATCH 23/53] Update shiba SVN to 30 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b085ae1f72b6821c4f6e2bbf0e741148775346d8) Merged-In: I2ef29057958ba6e31c76973de70d69577c1befe5 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 3037f30..498b52c 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -373,7 +373,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 815dfea454b8e6a9bd1bdfbfe9a754127a283efe Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:10:47 +0000 Subject: [PATCH 24/53] Update shiba SVN to 31 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:98ed4cdd4eb4b4e8deb094478a8a351bea7a6cdc) Merged-In: I2f0f9681455968cdaed4a74d3a77c0b2de1ba14b 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 498b52c..da87077 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -373,7 +373,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 8d8b1021fa91fa0a64f90a87acf9d01b6842fb22 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:15:27 +0000 Subject: [PATCH 25/53] Update husky SVN to 30 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a7b24379b54da71b59da2c80dc3ede5ce83beafd) Merged-In: Icdbc5cd31dbca584589f703c16aa18698f7de294 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 f199bd0..e938c1b 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -396,7 +396,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 5e9345a0e75da69aba034157a05d0eafda1513c3 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:13:33 +0000 Subject: [PATCH 26/53] Update shiba SVN to 32 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3e5bfd7a40cb6652407777caadb206c07171cf8) Merged-In: I18527bb9a4358c14b2e99646670f0ab2da8173f0 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 da87077..4965a07 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -373,7 +373,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 f92416d65f51e4b9f23fc4136348764a771b97b9 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:17:07 +0000 Subject: [PATCH 27/53] Update husky SVN to 31 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:810570db667f583164ab6af56df0ecbe9756b1d6) Merged-In: I2bdfbbed0dff3c3c093dd46200f2d8ce15c28652 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 e938c1b..5b6070e 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -396,7 +396,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 3555945dd0e4bddc87b59aeef6b5b17bd662428b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:18:42 +0000 Subject: [PATCH 28/53] Update husky SVN to 32 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fe6c3b8adfa981b440aaf8250b633ca5db4de643) Merged-In: Icb9de546d095ed4d97e52cc32c1b034856ccd6fb 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 5b6070e..aad692e 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -396,7 +396,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 4ef15ac1596dd6c5f4119892077c3bd41b6c5d61 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 3 Apr 2024 18:57:52 +0000 Subject: [PATCH 29/53] shusky: Use build_flags for SVN Flag: build.RELEASE_SVN_HUSKY Flag: build.RELEASE_SVN_SHIBA Bug: 332726030 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c0b973e012e8a0de9b3094a573b2eeff93f0743) Merged-In: I289ffb153c91536c3d505dba3efe6b9096dbad50 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 2d20fffe253954764bf46087b0a112049d214ef2 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:41:20 +0000 Subject: [PATCH 30/53] Update husky SVN to 33 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4b4f16c266ad592ed13c50202ce690c939410cdd) Merged-In: I9beeef1b118a8d8a05ea14072e211d2f25eaf164 Change-Id: I9beeef1b118a8d8a05ea14072e211d2f25eaf164 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 0c180c3..98de082 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -399,7 +399,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 d5e1cb35672ed505697a90ebb2289765b825ad05 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:43:18 +0000 Subject: [PATCH 31/53] Update husky SVN to 34 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c473353c4c58c6d178bedfec15d4d53595b941d5) Merged-In: Ieb8ec0e93b463e95787a3ceed0ed4cddf78b262a Change-Id: Ieb8ec0e93b463e95787a3ceed0ed4cddf78b262a --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 98de082..11893ce 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -399,7 +399,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 0cf0f973f55890ea2a417a85b91b6b25bde4b6d6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:21:17 +0000 Subject: [PATCH 32/53] Update shiba SVN to 33 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d9fa747d2582f885232423a464786d838d11b81a) Merged-In: I4ad3b7e298cf6ec12e2cfc8873a24492fd5c25df Change-Id: I4ad3b7e298cf6ec12e2cfc8873a24492fd5c25df --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 942ec14..7c64ca0 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -376,7 +376,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 4d3c5858ead940b846bd054cf5fa7122aa6ed6d3 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:37:46 +0000 Subject: [PATCH 33/53] Update shiba SVN to 34 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a1e3e6cce330644fffac42cc04e7e607be88efa2) Merged-In: I9c7a9f6da772ecee70b9022aa29e8a3ad0d130d4 Change-Id: I9c7a9f6da772ecee70b9022aa29e8a3ad0d130d4 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 7c64ca0..e23ca0a 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -376,7 +376,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 63a206f38c5dd267c320b3a3d9f1c2963e4b8116 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:39:27 +0000 Subject: [PATCH 34/53] Update shiba SVN to 35 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:633317c02cf441e3fc03151ed15ecb72bd29fd98) Merged-In: Ib5c55167cdc0bbae64e48adb6778c445a38e5cc1 Change-Id: Ib5c55167cdc0bbae64e48adb6778c445a38e5cc1 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index e23ca0a..eadaa37 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -376,7 +376,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 a9cd72541f4291f58054d9f1832255a2ada743d6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:46:05 +0000 Subject: [PATCH 35/53] Update husky SVN to 35 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f5bb7a3f5605d94f482aeb7a50b842eb2e9a1942) Merged-In: I661546ae0ab104021936acd109e08de2a64a1b1c Change-Id: I661546ae0ab104021936acd109e08de2a64a1b1c --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 11893ce..f1aec80 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -399,7 +399,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 df6fafe03aa979262be86054a6ab8287b6272792 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 25 Jul 2024 15:05:59 +0000 Subject: [PATCH 36/53] 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 fab7721b14ab81437fbd35fbbd39fa84b7cca115 Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 25 Jul 2024 18:25:47 +0000 Subject: [PATCH 37/53] 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 38/53] 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 39/53] 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 40/53] 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 41/53] 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 42/53] 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 43/53] 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 ea3a914a038eb5651d83cd5d9e24e4e152d40de5 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 19 Apr 2024 20:59:35 +0000 Subject: [PATCH 44/53] 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 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:28a1b27468d204366837ce4ce8e2e5559ac6bf2a) Merged-In: Ibec4f0c908089ca4304e59e9d37529fa2d4fa40d 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 f1aec80..ba387c9 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -405,6 +405,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 eadaa37..04a51b0 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -382,6 +382,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 f113c3653fb618c36e66ea16ed371f4260150cb7 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Fri, 9 Aug 2024 08:34:10 +0000 Subject: [PATCH 45/53] 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 9e2e0835ec6d87521a7ac73af3be4629a3ba8363 Mon Sep 17 00:00:00 2001 From: Shreshta Manu Date: Wed, 14 Aug 2024 18:41:45 +0000 Subject: [PATCH 46/53] [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 47/53] 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 48/53] 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 49/53] 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 50/53] 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 51/53] 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 52/53] 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 53/53] 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",