Merge "LeAudio: Add symmetric set configurations for LIVE scenario" into tm-qpr-dev (563586d3) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/le_audio/audio_set_configurations.json

+272 −0

Original line number	Diff line number	Diff line
		@@ -1007,6 +1007,16 @@
		"codec_config_name": "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_16_2",
		"qos_config_name": ["QoS_Config_Server_Preferred"]
		},
		{
		"name": "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_1_Server_Preferred",
		"codec_config_name": "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_1",
		"qos_config_name": ["QoS_Config_Server_Preferred"]
		},
		{
		"name": "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_2_Server_Preferred",
		"codec_config_name": "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_2",
		"qos_config_name": ["QoS_Config_Server_Preferred"]
		},
		{
		"name": "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_Server_Preferred_1",
		"codec_config_name": "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_1",
		@@ -8614,6 +8624,268 @@
		}
		]
		},
		{
		"name": "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_1",
		"subconfigurations": [
		{
		"target_latency": "BALANCED_RELIABILITY",
		"device_cnt": 2,
		"ase_cnt": 2,
		"direction": "SOURCE",
		"configuration_strategy": "STEREO_ONE_CIS_PER_DEVICE",
		"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": "audio_channel_allocation",
		"type": 3,
		"compound_value": {
		"value": [
		3,
		0,
		0,
		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
		]
		}
		}
		]
		},
		{
		"target_latency": "BALANCED_RELIABILITY",
		"device_cnt": 2,
		"ase_cnt": 2,
		"direction": "SINK",
		"configuration_strategy": "STEREO_ONE_CIS_PER_DEVICE",
		"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": "audio_channel_allocation",
		"type": 3,
		"compound_value": {
		"value": [
		3,
		0,
		0,
		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
		]
		}
		}
		]
		}
		]
		},
		{
		"name": "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_2",
		"subconfigurations": [
		{
		"target_latency": "BALANCED_RELIABILITY",
		"device_cnt": 2,
		"ase_cnt": 2,
		"direction": "SOURCE",
		"configuration_strategy": "STEREO_ONE_CIS_PER_DEVICE",
		"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": "audio_channel_allocation",
		"type": 3,
		"compound_value": {
		"value": [
		3,
		0,
		0,
		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
		]
		}
		}
		]
		},
		{
		"target_latency": "BALANCED_RELIABILITY",
		"device_cnt": 2,
		"ase_cnt": 2,
		"direction": "SINK",
		"configuration_strategy": "STEREO_ONE_CIS_PER_DEVICE",
		"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": "audio_channel_allocation",
		"type": 3,
		"compound_value": {
		"value": [
		3,
		0,
		0,
		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
		]
		}
		}
		]
		}
		]
		},
		{
		"name": "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_1",
		"subconfigurations": [

system/bta/le_audio/audio_set_scenarios.json

+59 −1

Original line number	Diff line number	Diff line
		@@ -163,6 +163,32 @@
		{
		"name": "VoiceAssistants",
		"configurations": [
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_48_1_Server_Preferred",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_48_2_Server_Preferred",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_Server_Preferred",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_1",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_Server_Preferred",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_1",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_Server_Preferred",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_1",
		"SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_Server_Preferred",
		"SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_1",
		"SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_Server_Preferred",
		"SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_1",
		"SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_Server_Preferred",
		"SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_1",
		"SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_Server_Preferred",
		"SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_1",
		"SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_Server_Preferred",
		"SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_1",
		"SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_Server_Preferred",
		"SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_1",
		"SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_Server_Preferred",
		"SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_1",
		"SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_Server_Preferred",
		"SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_1",
		"SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_Server_Preferred",
		"SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_1",
		"DualDev_OneChanStereoSnk_48_4_1_OneChanStereoSrc_32_2_1_Server_Preferred",
		"DualDev_OneChanStereoSnk_48_4_2_OneChanStereoSrc_32_2_2_Server_Preferred",
		"DualDev_OneChanStereoSnk_48_4_1_OneChanStereoSrc_24_2_1_Server_Preferred",
		@@ -211,7 +237,39 @@
		"name": "Live",
		"configurations": [
		"VND_SingleDev_TwoChanStereoSrc_48khz_100octs_Server_Preferred_1",
		"VND_SingleDev_TwoChanStereoSrc_48khz_100octs_R11_L40_1"
		"VND_SingleDev_TwoChanStereoSrc_48khz_100octs_R11_L40_1",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_48_1_Server_Preferred",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_48_2_Server_Preferred",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_Server_Preferred",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_1",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_Server_Preferred",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_1",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_Server_Preferred",
		"DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_1",
		"SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_Server_Preferred",
		"SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_1",
		"SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_Server_Preferred",
		"SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_1",
		"SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_Server_Preferred",
		"SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_1",
		"SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_Server_Preferred",
		"SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_1",
		"SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_Server_Preferred",
		"SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_1",
		"SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_Server_Preferred",
		"SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_1",
		"SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_Server_Preferred",
		"SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_1",
		"SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_Server_Preferred",
		"SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_1",
		"SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_Server_Preferred",
		"SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_1",
		"SingleDev_OneChanMonoSrc_48_2_Server_Preferred",
		"SingleDev_OneChanMonoSrc_48_1_Server_Preferred",
		"SingleDev_OneChanMonoSrc_32_2_Server_Preferred",
		"SingleDev_OneChanMonoSrc_32_1_Server_Preferred",
		"SingleDev_OneChanMonoSrc_16_2_Server_Preferred",
		"SingleDev_OneChanMonoSrc_16_1_Server_Preferred"
		]
		}
		]

system/bta/le_audio/le_audio_client_test.cc

+2 −4

Original line number	Diff line number	Diff line
		@@ -3709,10 +3709,8 @@ TEST_F(UnicastTest, MicrophoneAttachToCurrentMediaScenario) {
		EXPECT_CALL(*mock_le_audio_sink_hal_client_, Start(_, _)).Times(1);
		LeAudioClient::Get()->GroupSetActive(group_id);

		EXPECT_CALL(
		mock_state_machine_,
		StartStream(_, le_audio::types::LeAudioContextType::VOICEASSISTANTS, _,
		_))
		EXPECT_CALL(mock_state_machine_,
		StartStream(_, le_audio::types::LeAudioContextType::LIVE, _, _))
		.Times(1);

		StartStreaming(AUDIO_USAGE_MEDIA, AUDIO_CONTENT_TYPE_MUSIC, group_id,