Bluetooth: Audio: broadcast_source_create array of stream pointers

The bt_audio_broadcast_source_create function will now
take an array of stream pointers, instead of an array
of streams. This is to make the API more flexible as
well as more consistent with the unicast API.

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

Author: Thalley

include/zephyr/bluetooth/audio/audio.h

@@ -1634,7 +1634,7 @@ int bt_audio_unicast_group_delete(struct bt_audio_unicast_group *unicast_group);
  *  called and no audio information (BIGInfo) will be visible to scanners
  *  (see bt_le_per_adv_sync_cb).
  *
- *  @param[in]  streams     Array of stream objects being used for the
+ *  @param[in]  streams     Array of stream object pointers being used for the
  *                          broadcaster. This array shall remain valid for the
  *                          duration of the broadcast source.
  *  @param[in]  num_stream  Number of streams in @p streams.
@@ -1644,7 +1644,7 @@ int bt_audio_unicast_group_delete(struct bt_audio_unicast_group *unicast_group);
  *
  *  @return Zero on success or (negative) error code otherwise.
  */
-int bt_audio_broadcast_source_create(struct bt_audio_stream *streams,
+int bt_audio_broadcast_source_create(struct bt_audio_stream *streams[],
 				     size_t num_stream,
 				     struct bt_codec *codec,
 				     struct bt_codec_qos *qos,

subsys/bluetooth/audio/broadcast_source.c

@@ -372,7 +372,11 @@ static int bt_audio_set_base(const struct bt_audio_broadcast_source *source,
 static void broadcast_source_cleanup(struct bt_audio_broadcast_source *source)
 {
 	for (size_t i = 0; i < source->stream_count; i++) {
-		struct bt_audio_stream *stream = &source->streams[i];
+		struct bt_audio_stream *stream = source->streams[i];
+
+		if (stream == NULL) {
+			continue;
+		}
 
 		stream->ep->stream = NULL;
 		stream->ep = NULL;
@@ -385,7 +389,7 @@ static void broadcast_source_cleanup(struct bt_audio_broadcast_source *source)
 	(void)memset(source, 0, sizeof(*source));
 }
 
-int bt_audio_broadcast_source_create(struct bt_audio_stream *streams,
+int bt_audio_broadcast_source_create(struct bt_audio_stream *streams[],
 				     size_t num_stream,
 				     struct bt_codec *codec,
 				     struct bt_codec_qos *qos,
@@ -437,6 +441,13 @@ int bt_audio_broadcast_source_create(struct bt_audio_stream *streams,
 		return -EINVAL;
 	}
 
+	for (size_t i = 0; i < num_stream; i++) {
+		CHECKIF(streams[i] == NULL) {
+			BT_DBG("streams[%zu] is NULL", i);
+			return -EINVAL;
+		}
+	}
+
 	source = NULL;
 	for (index = 0; index < ARRAY_SIZE(broadcast_sources); index++) {
 		if (broadcast_sources[index].bis[0] == NULL) { /* Find free entry */
@@ -453,7 +464,7 @@ int bt_audio_broadcast_source_create(struct bt_audio_stream *streams,
 	source->streams = streams;
 	source->stream_count = num_stream;
 	for (size_t i = 0; i < num_stream; i++) {
-		struct bt_audio_stream *stream = &streams[i];
+		struct bt_audio_stream *stream = streams[i];
 
 		err = bt_audio_broadcast_source_setup_stream(index, stream,
 							     codec, qos);
@@ -534,7 +545,7 @@ int bt_audio_broadcast_source_create(struct bt_audio_stream *streams,
 	}
 
 	for (size_t i = 0; i < source->stream_count; i++) {
-		struct bt_audio_ep *ep = streams[i].ep;
+		struct bt_audio_ep *ep = streams[i]->ep;
 
 		ep->broadcast_source = source;
 		broadcast_source_set_ep_state(ep,
@@ -562,7 +573,7 @@ int bt_audio_broadcast_source_reconfig(struct bt_audio_broadcast_source *source,
 		return -EINVAL;
 	}
 
-	stream = &source->streams[0];
+	stream = source->streams[0];
 
 	if (stream == NULL) {
 		BT_DBG("stream is NULL");
@@ -581,7 +592,12 @@ int bt_audio_broadcast_source_reconfig(struct bt_audio_broadcast_source *source,
 	}
 
 	for (size_t i = 0; i < source->stream_count; i++) {
-		stream = &source->streams[i];
+		stream = source->streams[i];
+
+		if (stream == NULL) {
+			BT_DBG("streams[i] is NULL");
+			return -EINVAL;
+		}
 
 		bt_audio_stream_attach(NULL, stream, stream->ep, codec);
 	}
@@ -608,7 +624,7 @@ int bt_audio_broadcast_source_start(struct bt_audio_broadcast_source *source)
 		return -EINVAL;
 	}
 
-	stream = &source->streams[0];
+	stream = source->streams[0];
 
 	if (stream == NULL) {
 		BT_DBG("stream is NULL");
@@ -653,7 +669,7 @@ int bt_audio_broadcast_source_stop(struct bt_audio_broadcast_source *source)
 		return -EINVAL;
 	}
 
-	stream = &source->streams[0];
+	stream = source->streams[0];
 
 	if (stream == NULL) {
 		BT_DBG("stream is NULL");
@@ -698,7 +714,7 @@ int bt_audio_broadcast_source_delete(struct bt_audio_broadcast_source *source)
 		return -EINVAL;
 	}
 
-	stream = &source->streams[0];
+	stream = source->streams[0];
 
 	if (stream != NULL) {
 		if (stream->ep == NULL) {

subsys/bluetooth/audio/endpoint.h

@@ -81,7 +81,7 @@ struct bt_audio_broadcast_source {
 	struct bt_iso_chan *bis[BROADCAST_STREAM_CNT];
 	struct bt_codec_qos *qos;
 	/* The streams used to create the broadcast source */
-	struct bt_audio_stream *streams;
+	struct bt_audio_stream **streams;
 };
 
 struct bt_audio_broadcast_sink {

subsys/bluetooth/shell/audio.c

@@ -1119,6 +1119,7 @@ static int cmd_select_broadcast_source(const struct shell *sh, size_t argc,
 static int cmd_create_broadcast(const struct shell *sh, size_t argc,
 				char *argv[])
 {
+	static struct bt_audio_stream *streams[ARRAY_SIZE(broadcast_source_streams)];
 	struct named_lc3_preset *named_preset;
 	int err;
 
@@ -1138,8 +1139,12 @@ static int cmd_create_broadcast(const struct shell *sh, size_t argc,
 		}
 	}
 
-	err = bt_audio_broadcast_source_create(broadcast_source_streams,
-					       ARRAY_SIZE(broadcast_source_streams),
+	(void)memset(streams, 0, sizeof(streams));
+	for (size_t i = 0; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &broadcast_source_streams[i];
+	}
+
+	err = bt_audio_broadcast_source_create(streams, ARRAY_SIZE(streams),
 					       &named_preset->preset.codec,
 					       &named_preset->preset.qos,
 					       &default_source);
@@ -1152,7 +1157,7 @@ static int cmd_create_broadcast(const struct shell *sh, size_t argc,
 		    named_preset->name);
 
 	if (default_stream == NULL) {
-		default_stream = &broadcast_source_streams[0];
+		default_stream = streams[0];
 	}
 
 	return 0;

tests/bluetooth/bsim_bt/bsim_test_audio/src/broadcast_source_test.c

@@ -18,6 +18,7 @@ static void test_main(void)
 	struct bt_audio_lc3_preset preset_16_2_1 = BT_AUDIO_LC3_BROADCAST_PRESET_16_2_1;
 	struct bt_audio_lc3_preset preset_16_2_2 = BT_AUDIO_LC3_BROADCAST_PRESET_16_2_2;
 	struct bt_audio_stream broadcast_source_streams[CONFIG_BT_AUDIO_BROADCAST_SRC_STREAM_COUNT];
+	struct bt_audio_stream *streams[ARRAY_SIZE(broadcast_source_streams)];
 	struct bt_audio_broadcast_source *source;
 
 	err = bt_enable(NULL);
@@ -31,9 +32,12 @@ static void test_main(void)
 	(void)memset(broadcast_source_streams, 0,
 		     sizeof(broadcast_source_streams));
 
+	for (size_t i = 0; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &broadcast_source_streams[i];
+	}
+
 	printk("Creating broadcast source\n");
-	err = bt_audio_broadcast_source_create(broadcast_source_streams,
-					       ARRAY_SIZE(broadcast_source_streams),
+	err = bt_audio_broadcast_source_create(streams, ARRAY_SIZE(streams),
 					       &preset_16_2_1.codec,
 					       &preset_16_2_1.qos,
 					       &source);
@@ -62,8 +66,7 @@ static void test_main(void)
 
 	/* Recreate broadcast source to verify that it's possible */
 	printk("Recreating broadcast source\n");
-	err = bt_audio_broadcast_source_create(broadcast_source_streams,
-					       ARRAY_SIZE(broadcast_source_streams),
+	err = bt_audio_broadcast_source_create(streams, ARRAY_SIZE(streams),
 					       &preset_16_2_1.codec,
 					       &preset_16_2_1.qos,
 					       &source);