samples: Bluetooth: CAP: Acceptor: Various fixes

The sample recently started supporting multiple sink ASEs,
but only support a single sink stream. Updated the number of
sink streams supported.

Modified how/when we reset the requested_bis_sync and
FLAG_BROADCAST_SYNC_REQUESTED in the broadcast implementation.

Removed a call to bt_bap_broadcast_sink_delete that would
always fail because it was already deleted.

Modified how/when the total_unicast_rx_iso_packet_count
and total_unicast_tx_iso_packet_count values were reset,
to support a future case of CAP handover.

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

Author: Thalley

samples/bluetooth/cap_acceptor/Kconfig

@@ -1,10 +1,10 @@
-# Copyright (c) 2022 Nordic Semiconductor ASA
+# Copyright (c) 2022-2025 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
 mainmenu "Bluetooth: Common Audio Profile Acceptor sample"
 
 config SAMPLE_UNICAST
-	bool "Whether or not to search for CAP acceptors for unicast audio"
+	bool "Whether or not advertise connectable support for unicast audio"
 	default y
 	select BT_BAP_UNICAST_SERVER
 	select BT_ISO_PERIPHERAL
@@ -19,7 +19,7 @@ config SAMPLE_UNICAST
 	  Broadcast Assistants.
 
 config SAMPLE_BROADCAST
-	bool "Whether or not to search for CAP acceptors for unicast audio"
+	bool "Whether or not advertise connectable support for broadcast audio"
 	default y if !SAMPLE_UNICAST
 	select BT_BAP_SCAN_DELEGATOR
 	select BT_OBSERVER

samples/bluetooth/cap_acceptor/src/cap_acceptor.h

@@ -18,8 +18,8 @@
 struct peer_config {
 	/** Stream for the source endpoint */
 	struct bt_cap_stream source_stream;
-	/** Stream for the sink endpoint */
-	struct bt_cap_stream sink_stream;
+	/** Streams for the sink endpoint */
+	struct bt_cap_stream sink_streams[CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT];
 	/** Semaphore to help wait for a release operation if the source stream is not idle */
 	struct k_sem source_stream_sem;
 	/** Semaphore to help wait for a release operation if the sink stream is not idle */

samples/bluetooth/cap_acceptor/src/cap_acceptor_broadcast.c

@@ -100,7 +100,6 @@ static int check_start_scan(void)
 static void broadcast_stream_started_cb(struct bt_bap_stream *bap_stream)
 {
 	LOG_INF("Started bap_stream %p", bap_stream);
-	total_broadcast_rx_iso_packet_count = 0U;
 
 	atomic_clear_bit(flags, FLAG_BROADCAST_SYNCING);
 	atomic_set_bit(flags, FLAG_BROADCAST_SYNCED);
@@ -256,11 +255,20 @@ static void syncable_cb(struct bt_bap_broadcast_sink *sink, const struct bt_iso_
 	}
 }
 
+static void sink_started_cb(struct bt_bap_broadcast_sink *sink)
+{
+	LOG_INF("Broadcast sink started");
+
+	/* Clear requested BIS sync */
+	broadcast_sink.requested_bis_sync = 0;
+	atomic_clear_bit(flags, FLAG_BROADCAST_SYNC_REQUESTED);
+}
+
 static void sink_stopped_cb(struct bt_bap_broadcast_sink *sink, uint8_t reason)
 {
 	int err;
 
-	LOG_INF("Broadcast sink stopped with reason %u", reason);
+	LOG_INF("Broadcast sink stopped with reason 0x%02X", reason);
 
 	err = bt_bap_broadcast_sink_delete(sink);
 	if (err != 0) {
@@ -481,7 +489,10 @@ static int bis_sync_req_cb(struct bt_conn *conn,
 		return -ENOMEM;
 	}
 
-	if (broadcast_sink.requested_bis_sync == new_bis_sync_req) {
+	if (atomic_test_bit(flags, FLAG_BROADCAST_SYNC_REQUESTED) &&
+	    broadcast_sink.requested_bis_sync == new_bis_sync_req) {
+		LOG_INF("New request (0x%08x) is the same as last request; ignoring",
+			new_bis_sync_req);
 		return 0; /* no op */
 	}
 
@@ -491,6 +502,8 @@ static int bis_sync_req_cb(struct bt_conn *conn,
 		 */
 		int err;
 
+		LOG_INF("Already synced. Stopping current sync and attempt resyncing");
+
 		/* The stream stopped callback will be called as part of this,
 		 * and we do not need to wait for any events from the
 		 * controller. Thus, when this returns, the broadcast sink is stopped
@@ -502,13 +515,7 @@ static int bis_sync_req_cb(struct bt_conn *conn,
 			return err;
 		}
 
-		err = bt_bap_broadcast_sink_delete(broadcast_sink.bap_broadcast_sink);
-		if (err != 0) {
-			LOG_ERR("Failed to delete Broadcast Sink: %d", err);
-
-			return err;
-		}
-		broadcast_sink.bap_broadcast_sink = NULL;
+		/* Broadcast sink will be deleted and set to NULL in `sink_stopped_cb` */
 
 		atomic_clear_bit(flags, FLAG_BROADCAST_SYNCED);
 	}
@@ -517,8 +524,6 @@ static int bis_sync_req_cb(struct bt_conn *conn,
 	if (broadcast_sink.requested_bis_sync != 0U) {
 		atomic_set_bit(flags, FLAG_BROADCAST_SYNC_REQUESTED);
 		check_sync_broadcast();
-	} else {
-		atomic_clear_bit(flags, FLAG_BROADCAST_SYNC_REQUESTED);
 	}
 
 	return 0;
@@ -568,10 +573,9 @@ static void bap_pa_sync_terminated_cb(struct bt_le_per_adv_sync *sync,
 	if (sync == broadcast_sink.pa_sync) {
 		int err;
 
-		LOG_INF("PA sync %p lost with reason %u", (void *)sync, info->reason);
+		LOG_INF("PA sync %p lost with reason 0x%02X", (void *)sync, info->reason);
 
 		/* Without PA we cannot sync to any new BIG - Clear data */
-		broadcast_sink.requested_bis_sync = 0;
 		broadcast_sink.pa_sync = NULL;
 		k_work_cancel_delayable(&pa_timer);
 		atomic_clear_bit(flags, FLAG_BROADCAST_SYNCABLE);
@@ -736,6 +740,7 @@ int init_cap_acceptor_broadcast(void)
 		static struct bt_bap_broadcast_sink_cb broadcast_sink_cbs = {
 			.base_recv = base_recv_cb,
 			.syncable = syncable_cb,
+			.started = sink_started_cb,
 			.stopped = sink_stopped_cb,
 		};
 		static struct bt_bap_stream_ops broadcast_stream_ops = {

samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c

@@ -1,7 +1,7 @@
 /** @file
  *  @brief Bluetooth Common Audio Profile (CAP) Acceptor unicast.
  *
- *  Copyright (c) 2021-2024 Nordic Semiconductor ASA
+ *  Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *  Copyright (c) 2023 NXP
  *
  *  SPDX-License-Identifier: Apache-2.0
@@ -296,7 +296,6 @@ static void unicast_stream_enabled_cb(struct bt_bap_stream *bap_stream)
 static void unicast_stream_started_cb(struct bt_bap_stream *bap_stream)
 {
 	LOG_INF("Started bap_stream %p", bap_stream);
-	total_unicast_rx_iso_packet_count = 0U;
 }
 
 static void unicast_stream_metadata_updated_cb(struct bt_bap_stream *bap_stream)
@@ -438,7 +437,10 @@ int init_cap_acceptor_unicast(struct peer_config *peer)
 	}
 
 	bt_cap_stream_ops_register(&peer->source_stream, &unicast_stream_ops);
-	bt_cap_stream_ops_register(&peer->sink_stream, &unicast_stream_ops);
+
+	ARRAY_FOR_EACH_PTR(peer->sink_streams, stream) {
+		bt_cap_stream_ops_register(stream, &unicast_stream_ops);
+	}
 
 	if (IS_ENABLED(CONFIG_BT_ASCS_ASE_SRC)) {
 		static bool thread_started;
@@ -459,5 +461,8 @@ int init_cap_acceptor_unicast(struct peer_config *peer)
 	k_sem_init(&peer->source_stream_sem, 0, 1);
 	k_sem_init(&peer->sink_stream_sem, 0, 1);
 
+	total_unicast_rx_iso_packet_count = 0U;
+	total_unicast_tx_iso_packet_count = 0U;
+
 	return 0;
 }

samples/bluetooth/cap_acceptor/src/main.c

@@ -26,6 +26,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/logging/log_core.h>
+#include <zephyr/sys/__assert.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/util_macro.h>
 
@@ -140,21 +141,32 @@ static int advertise(void)
 
 struct bt_cap_stream *stream_alloc(enum bt_audio_dir dir)
 {
-	if (dir == BT_AUDIO_DIR_SINK && peer.sink_stream.bap_stream.ep == NULL) {
-		return &peer.sink_stream;
+	struct bt_cap_stream *ret_stream;
+
+	if (dir == BT_AUDIO_DIR_SINK) {
+		ret_stream = NULL;
+		ARRAY_FOR_EACH_PTR(peer.sink_streams, stream) {
+			if (stream->bap_stream.ep == NULL) {
+				ret_stream = stream;
+			}
+		}
 	} else if (dir == BT_AUDIO_DIR_SOURCE && peer.source_stream.bap_stream.ep == NULL) {
-		return &peer.source_stream;
+		ret_stream = &peer.source_stream;
+	} else {
+		ret_stream = NULL;
 	}
 
-	return NULL;
+	return ret_stream;
 }
 
 void stream_released(const struct bt_cap_stream *cap_stream)
 {
 	if (cap_stream == &peer.source_stream) {
 		k_sem_give(&peer.source_stream_sem);
-	} else if (cap_stream == &peer.sink_stream) {
+	} else if (IS_ARRAY_ELEMENT(peer.sink_streams, cap_stream)) {
 		k_sem_give(&peer.sink_stream_sem);
+	} else {
+		__ASSERT(false, "Invalid stream: %p", cap_stream);
 	}
 }
 
@@ -201,11 +213,13 @@ static int reset_cap_acceptor(void)
 		}
 	}
 
-	if (peer.sink_stream.bap_stream.ep != NULL) {
-		err = k_sem_take(&peer.sink_stream_sem, SEM_TIMEOUT);
-		if (err != 0) {
-			LOG_ERR("Timeout on sink_stream_sem: %d", err);
-			return err;
+	ARRAY_FOR_EACH_PTR(peer.sink_streams, stream) {
+		if (stream->bap_stream.ep != NULL) {
+			err = k_sem_take(&peer.sink_stream_sem, SEM_TIMEOUT);
+			if (err != 0) {
+				LOG_ERR("Timeout on sink_stream_sem: %d", err);
+				return err;
+			}
 		}
 	}
 

tests/bsim/bluetooth/audio_samples/cap/acceptor/src/cap_acceptor_sample_test.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2024 Nordic Semiconductor ASA
+ * Copyright (c) 2023-2025 Nordic Semiconductor ASA
  * Copyright (c) 2017-2019 Oticon A/S
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -51,13 +51,14 @@ static void test_cap_acceptor_sample_tick(bs_time_t HW_device_time)
 		extern uint64_t total_unicast_tx_iso_packet_count;
 
 		bs_trace_info_time(2, "%" PRIu64 " unicast packets received, expected >= %i\n",
-				   total_unicast_tx_iso_packet_count, PASS_THRESHOLD);
+				   total_unicast_rx_iso_packet_count, PASS_THRESHOLD);
 		bs_trace_info_time(2, "%" PRIu64 " unicast packets sent, expected >= %i\n",
 				   total_unicast_tx_iso_packet_count, PASS_THRESHOLD);
 
-		if (total_unicast_rx_iso_packet_count < PASS_THRESHOLD ||
+		/* Fail if we neither sent or receive any ISO packets */
+		if (total_unicast_rx_iso_packet_count < PASS_THRESHOLD &&
 		    total_unicast_tx_iso_packet_count < PASS_THRESHOLD) {
-			FAIL("cap_acceptor FAILED with(Did not pass after %d seconds)\n ",
+			FAIL("cap_acceptor unicast FAILED (Did not pass after %d seconds)\n ",
 			     WAIT_TIME);
 			return;
 		}
@@ -70,7 +71,7 @@ static void test_cap_acceptor_sample_tick(bs_time_t HW_device_time)
 				   total_broadcast_rx_iso_packet_count, PASS_THRESHOLD);
 
 		if (total_broadcast_rx_iso_packet_count < PASS_THRESHOLD) {
-			FAIL("cap_acceptor FAILED with (Did not pass after %d seconds)\n ",
+			FAIL("cap_acceptor broadcast FAILED (Did not pass after %d seconds)\n ",
 			     WAIT_TIME);
 			return;
 		}