tests: bsim: Bluetooth: BAP Broadcast update to 2 bis

Update the bsim test for the BAP broadcast to use 2 bis. This tests a larger part of the code, and also verifies that we can send and receive on 2 BIS without any ISO errors. Signed-off-by: Emil Gydesen <[email protected]>
zephyrproject-rtos · Oct 4, 2023 · cb9ee46 · cb9ee46
1 parent 1c0183b
commit cb9ee46
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/subsys/bluetooth/audio/bap_broadcast_source.c b/subsys/bluetooth/audio/bap_broadcast_source.c
@@ -799,7 +799,7 @@ int bt_bap_broadcast_source_reconfig(struct bt_bap_broadcast_source *source,
 			}
 		}
 
-		if (subgroup_stream_param_cnt < stream_cnt) {
+		if (stream_cnt < subgroup_stream_param_cnt) {
 			LOG_DBG("Invalid param->params[%zu]->params_count: %zu "
 				"(only %zu streams in subgroup)",
 				subgroup_cnt, subgroup_stream_param_cnt, stream_cnt);

diff --git a/tests/bsim/bluetooth/audio/prj.conf b/tests/bsim/bluetooth/audio/prj.conf
@@ -30,10 +30,10 @@ CONFIG_BT_BAP_BROADCAST_SOURCE=y
 CONFIG_BT_BAP_BROADCAST_SINK=y
 CONFIG_BT_AUDIO_CODEC_CFG_MAX_METADATA_SIZE=196
 CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE=196
-CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=1
+CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2
 CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=1
 CONFIG_BT_BAP_BROADCAST_SNK_SUBGROUP_COUNT=1
-CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT=1
+CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT=2
 CONFIG_BT_ISO_TX_BUF_COUNT=4
 CONFIG_BT_ISO_MAX_CHAN=4
 CONFIG_BT_ISO_TX_MTU=310
@@ -191,8 +191,8 @@ CONFIG_BT_CTLR_SYNC_ISO=y
 CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=255
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=251
 CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
-CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=1
-CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=1
+CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2
+CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2
 
 # Controller Connected ISO configs
 CONFIG_BT_CTLR_CENTRAL_ISO=y

diff --git a/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c b/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c
@@ -119,7 +119,7 @@ static int setup_broadcast_source(struct bt_bap_broadcast_source **source)
 	}
 
 	for (size_t i = 0U; i < ARRAY_SIZE(subgroup_params); i++) {
-		subgroup_params[i].params_count = 1U;
+		subgroup_params[i].params_count = ARRAY_SIZE(stream_params);
 		subgroup_params[i].params = &stream_params[i];
 		subgroup_params[i].codec_cfg = &preset_16_1_1.codec_cfg;
 	}