Bluetooth: Audio: Fix syncing to multiple BIS for broadcast sink shell

Fixed an issue with syncing to multiple BIS as the broadcast
sink in the shell. Also changed a check in the broadcast
sink implementation from an assert to a `if` to provide
a better way of handling bad input.

Signed-off-by: Emil Gydesen <[email protected]>

Author: Thalley

subsys/bluetooth/audio/broadcast_sink.c

@@ -1044,7 +1044,10 @@ int bt_audio_broadcast_sink_sync(struct bt_audio_broadcast_sink *sink,
 		if ((indexes_bitfield & BIT(i)) != 0) {
 			struct bt_codec *codec = codec_from_base_by_index(&sink->base, i);
 
-			__ASSERT(codec != NULL, "Codec[%d] was NULL", i);
+			if (codec == NULL) {
+				BT_DBG("Index %d not found in BASE", i);
+				return -EINVAL;
+			}
 
 			codecs[stream_count++] = codec;
 

subsys/bluetooth/shell/audio.c

@@ -1331,7 +1331,7 @@ static int cmd_sync_broadcast(const struct shell *sh, size_t argc, char *argv[])
 
 	bis_bitfield = 0;
 	for (int i = 1; i < argc; i++) {
-		unsigned long val = strtoul(argv[1], NULL, 16);
+		unsigned long val = strtoul(argv[i], NULL, 16);
 
 		if (val < 0x01 || val > 0x1F) {
 			shell_error(sh, "Invalid index: %ld", val);
@@ -1597,8 +1597,10 @@ SHELL_STATIC_SUBCMD_SET_CREATE(audio_cmds,
 		      cmd_broadcast_scan, 2, 0),
 	SHELL_CMD_ARG(accept_broadcast, NULL, "0x<broadcast_id>",
 		      cmd_accept_broadcast, 2, 0),
-	SHELL_CMD_ARG(sync_broadcast, NULL, "0x<bis_bitfield>",
-		      cmd_sync_broadcast, 2, 0),
+	SHELL_CMD_ARG(sync_broadcast, NULL,
+		      "0x<bis_index> [[[0x<bis_index>] 0x<bis_index>] ...]",
+		      cmd_sync_broadcast, 2,
+		      ARRAY_SIZE(broadcast_sink_streams) - 1),
 	SHELL_CMD_ARG(stop_broadcast_sink, NULL, "Stops broadcast sink",
 		      cmd_stop_broadcast_sink, 1, 0),
 	SHELL_CMD_ARG(term_broadcast_sink, NULL, "",

tests/bluetooth/shell/audio.conf

@@ -43,7 +43,9 @@ CONFIG_BT_ASCS_ASE_SRC_COUNT=2
 CONFIG_BT_ISO_MAX_CHAN=4
 CONFIG_BT_AUDIO_UNICAST_CLIENT=y
 CONFIG_BT_AUDIO_BROADCAST_SOURCE=y
+CONFIG_BT_AUDIO_BROADCAST_SRC_STREAM_COUNT=4
 CONFIG_BT_AUDIO_BROADCAST_SINK=y
+CONFIG_BT_AUDIO_BROADCAST_SNK_STREAM_COUNT=4
 CONFIG_BT_ISO_TX_BUF_COUNT=5
 CONFIG_BT_VOCS_MAX_INSTANCE_COUNT=1
 CONFIG_BT_VOCS_CLIENT_MAX_INSTANCE_COUNT=1