tests: Bluetooth: Audio: Add RX check for each stream

Changed the generic global flag_audio_received flag to
exist for each stream. This will help verify that each
stream, if configured for RX, receives the expected
data.

One test started failing due to this, so that was disabled
until a fix is in place in the controller.

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

Author: Thalley

tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c

@@ -570,6 +570,7 @@ static void stream_started_cb(struct bt_bap_stream *stream)
 	memset(&test_stream->last_info, 0, sizeof(test_stream->last_info));
 	test_stream->rx_cnt = 0U;
 	test_stream->valid_rx_cnt = 0U;
+	UNSET_FLAG(test_stream->flag_audio_received);
 
 	err = bt_bap_ep_get_info(stream->ep, &info);
 	if (err != 0) {
@@ -920,6 +921,17 @@ static void test_broadcast_delete_inval(void)
 	}
 }
 
+static void wait_for_data(void)
+{
+	printk("Waiting for data\n");
+	ARRAY_FOR_EACH_PTR(broadcast_sink_streams, test_stream) {
+		if (audio_test_stream_is_streaming(test_stream)) {
+			WAIT_FOR_FLAG(test_stream->flag_audio_received);
+		}
+	}
+	printk("Data received\n");
+}
+
 static void test_common(void)
 {
 	int err;
@@ -953,8 +965,7 @@ static void test_common(void)
 		k_sem_take(&sem_stream_started, K_FOREVER);
 	}
 
-	printk("Waiting for data\n");
-	WAIT_FOR_FLAG(flag_audio_received);
+	wait_for_data();
 	backchannel_sync_send_all(); /* let other devices know we have received what we wanted */
 }
 
@@ -1067,8 +1078,7 @@ static void test_sink_encrypted(void)
 		k_sem_take(&sem_stream_started, K_FOREVER);
 	}
 
-	printk("Waiting for data\n");
-	WAIT_FOR_FLAG(flag_audio_received);
+	wait_for_data();
 
 	backchannel_sync_send_all(); /* let other devices know we have received data */
 
@@ -1122,9 +1132,7 @@ static void test_sink_encrypted_incorrect_code(void)
 		k_sem_take(&sem_stream_started, K_FOREVER);
 	}
 
-	printk("Waiting for data\n");
-	WAIT_FOR_FLAG(flag_audio_received);
-	printk("Data received\n");
+	wait_for_data();
 
 	backchannel_sync_send_all(); /* let other devices know we have received data */
 	backchannel_sync_send_all(); /* let the broadcast source know it can stop */
@@ -1171,8 +1179,7 @@ static void broadcast_sink_with_assistant(void)
 		k_sem_take(&sem_stream_started, K_FOREVER);
 	}
 
-	printk("Waiting for data\n");
-	WAIT_FOR_FLAG(flag_audio_received);
+	wait_for_data();
 	backchannel_sync_send_all(); /* let other devices know we have received what we wanted */
 
 	printk("Waiting for BIG sync terminate request\n");

tests/bsim/bluetooth/audio/src/bap_common.c

@@ -12,13 +12,15 @@
 #include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/audio/audio.h>
 #include <zephyr/bluetooth/audio/bap.h>
+#include <zephyr/bluetooth/audio/cap.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/printk.h>
 
 #include "bap_common.h"
+#include "common.h"
 
 #define VS_CODEC_CID 0x05F1 /* Linux foundation*/
 #define VS_CODEC_VID 0x1234 /* any value*/
@@ -138,3 +140,39 @@ void copy_unicast_stream_preset(struct unicast_stream *stream,
 	memcpy(&stream->qos, &named_preset->preset.qos, sizeof(stream->qos));
 	memcpy(&stream->codec_cfg, &named_preset->preset.codec_cfg, sizeof(stream->codec_cfg));
 }
+
+bool bap_stream_is_streaming(const struct bt_bap_stream *bap_stream)
+{
+	struct bt_bap_ep_info ep_info;
+	int err;
+
+	if (bap_stream == NULL) {
+		return false;
+	}
+
+	/* No-op if stream is not configured */
+	if (bap_stream->ep == NULL) {
+		return false;
+	}
+
+	err = bt_bap_ep_get_info(bap_stream->ep, &ep_info);
+	if (err != 0) {
+		return false;
+	}
+
+	if (ep_info.iso_chan == NULL || ep_info.iso_chan->state != BT_ISO_STATE_CONNECTED) {
+		return false;
+	}
+
+	return ep_info.state == BT_BAP_EP_STATE_STREAMING;
+}
+
+bool cap_stream_is_streaming(const struct bt_cap_stream *cap_stream)
+{
+	return bap_stream_is_streaming(&cap_stream->bap_stream);
+}
+
+bool audio_test_stream_is_streaming(const struct audio_test_stream *test_stream)
+{
+	return cap_stream_is_streaming(&test_stream->stream);
+}

tests/bsim/bluetooth/audio/src/bap_common.h

@@ -117,5 +117,7 @@ static inline bool valid_metadata_type(uint8_t type, uint8_t len)
 		return false;
 	}
 }
-
+bool bap_stream_is_streaming(const struct bt_bap_stream *bap_stream);
+bool cap_stream_is_streaming(const struct bt_cap_stream *cap_stream);
+bool audio_test_stream_is_streaming(const struct audio_test_stream *test_stream);
 #endif /* ZEPHYR_TEST_BSIM_BT_AUDIO_TEST_COMMON_ */

tests/bsim/bluetooth/audio/src/bap_stream_rx.c

@@ -17,6 +17,8 @@
 
 LOG_MODULE_REGISTER(bap_stream_rx, LOG_LEVEL_INF);
 
+#define LOG_INTERVAL 100
+
 static void log_stream_rx(struct bt_bap_stream *stream, const struct bt_iso_recv_info *info,
 			  struct net_buf *buf)
 {
@@ -27,54 +29,77 @@ static void log_stream_rx(struct bt_bap_stream *stream, const struct bt_iso_recv
 		info->seq_num, info->ts);
 }
 
+static void log_stream_err(struct audio_test_stream *test_stream,
+			   const struct bt_iso_recv_info *info, struct net_buf *buf)
+{
+	if (!test_stream->last_rx_failed || (test_stream->rx_cnt % LOG_INTERVAL) == 0U) {
+		log_stream_rx(&test_stream->stream.bap_stream, info, buf);
+	}
+
+	test_stream->last_rx_failed = true;
+}
+
 void bap_stream_rx_recv_cb(struct bt_bap_stream *stream, const struct bt_iso_recv_info *info,
 			   struct net_buf *buf)
 {
 	struct audio_test_stream *test_stream = audio_test_stream_from_bap_stream(stream);
+	static bool last_failed;
 
 	test_stream->rx_cnt++;
 	if ((info->flags & BT_ISO_FLAGS_VALID) != 0) {
 		if (memcmp(buf->data, mock_iso_data, buf->len) == 0) {
 			test_stream->valid_rx_cnt++;
+			last_failed = false;
 
 			if (test_stream->valid_rx_cnt >= MIN_SEND_COUNT) {
-				/* We set the flag is just one stream has received the expected */
-				SET_FLAG(flag_audio_received);
+				SET_FLAG(test_stream->flag_audio_received);
 			}
 		} else {
-			log_stream_rx(stream, info, buf);
+			log_stream_err(test_stream, info, buf);
 			FAIL("Unexpected data received\n");
 		}
 	}
 
-	if ((test_stream->rx_cnt % 50U) == 0U) {
+	if ((test_stream->rx_cnt % LOG_INTERVAL) == 0U) {
 		log_stream_rx(stream, info, buf);
 	}
 
+	if (test_stream->rx_cnt >= LOG_INTERVAL && test_stream->valid_rx_cnt == 0U) {
+		log_stream_err(test_stream, info, buf);
+
+		FAIL("No valid RX received: %zu/%zu\n", test_stream->valid_rx_cnt,
+		     test_stream->rx_cnt);
+	}
+
 	if (info->ts == test_stream->last_info.ts) {
-		log_stream_rx(stream, info, buf);
+		log_stream_err(test_stream, info, buf);
+
 		if (test_stream->valid_rx_cnt > 1U) {
 			FAIL("Duplicated timestamp received: %u\n", test_stream->last_info.ts);
 		}
 	}
 
 	if (info->seq_num == test_stream->last_info.seq_num) {
-		log_stream_rx(stream, info, buf);
+		log_stream_err(test_stream, info, buf);
+
 		if (test_stream->valid_rx_cnt > 1U) {
 			FAIL("Duplicated PSN received: %u\n", test_stream->last_info.seq_num);
 		}
 	}
 
 	if (info->flags & BT_ISO_FLAGS_ERROR) {
 		/* Fail the test if we have not received what we expected */
-		log_stream_rx(stream, info, buf);
-		if (test_stream->valid_rx_cnt > 1U && !TEST_FLAG(flag_audio_received)) {
+		log_stream_err(test_stream, info, buf);
+
+		if (test_stream->valid_rx_cnt > 1U &&
+		    !TEST_FLAG(test_stream->flag_audio_received)) {
 			FAIL("ISO receive error\n");
 		}
 	}
 
 	if (info->flags & BT_ISO_FLAGS_LOST) {
-		log_stream_rx(stream, info, buf);
+		log_stream_err(test_stream, info, buf);
+
 		if (test_stream->valid_rx_cnt > 1U) {
 			FAIL("ISO receive lost\n");
 		}

tests/bsim/bluetooth/audio/src/bap_stream_tx.c

@@ -27,6 +27,7 @@
 #include <zephyr/sys/util_macro.h>
 #include <zephyr/types.h>
 
+#include "bap_common.h"
 #include "bap_stream_tx.h"
 #include "common.h"
 
@@ -43,32 +44,6 @@ struct tx_stream {
 
 static struct tx_stream tx_streams[CONFIG_BT_ISO_MAX_CHAN];
 
-static bool stream_is_streaming(const struct bt_bap_stream *bap_stream)
-{
-	struct bt_bap_ep_info ep_info;
-	int err;
-
-	if (bap_stream == NULL) {
-		return false;
-	}
-
-	/* No-op if stream is not configured */
-	if (bap_stream->ep == NULL) {
-		return false;
-	}
-
-	err = bt_bap_ep_get_info(bap_stream->ep, &ep_info);
-	if (err != 0) {
-		return false;
-	}
-
-	if (ep_info.iso_chan == NULL || ep_info.iso_chan->state != BT_ISO_STATE_CONNECTED) {
-		return false;
-	}
-
-	return ep_info.state == BT_BAP_EP_STATE_STREAMING;
-}
-
 static void tx_thread_func(void *arg1, void *arg2, void *arg3)
 {
 	NET_BUF_POOL_FIXED_DEFINE(tx_pool, CONFIG_BT_ISO_TX_BUF_COUNT,
@@ -88,7 +63,7 @@ static void tx_thread_func(void *arg1, void *arg2, void *arg3)
 		for (size_t i = 0U; i < ARRAY_SIZE(tx_streams); i++) {
 			struct bt_bap_stream *bap_stream = tx_streams[i].bap_stream;
 
-			if (stream_is_streaming(bap_stream) &&
+			if (bap_stream_is_streaming(bap_stream) &&
 			    atomic_get(&tx_streams[i].enqueued) < ENQUEUE_CNT) {
 				struct net_buf *buf;
 
@@ -102,7 +77,7 @@ static void tx_thread_func(void *arg1, void *arg2, void *arg3)
 					tx_streams[i].seq_num++;
 					atomic_inc(&tx_streams[i].enqueued);
 				} else {
-					if (!stream_is_streaming(bap_stream)) {
+					if (!bap_stream_is_streaming(bap_stream)) {
 						/* Can happen if we disconnected while waiting for a
 						 * buffer - Ignore
 						 */

tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c

@@ -850,8 +850,11 @@ static void transceive_streams(void)
 	}
 
 	if (source_stream != NULL) {
+		struct audio_test_stream *test_stream =
+			audio_test_stream_from_bap_stream(source_stream);
+
 		printk("Waiting for data\n");
-		WAIT_FOR_FLAG(flag_audio_received);
+		WAIT_FOR_FLAG(test_stream->flag_audio_received);
 	}
 }
 

tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c

@@ -336,8 +336,11 @@ static void transceive_test_streams(void)
 	}
 
 	if (sink_stream != NULL) {
+		struct audio_test_stream *test_stream =
+			audio_test_stream_from_bap_stream(sink_stream);
+
 		printk("Waiting for data\n");
-		WAIT_FOR_FLAG(flag_audio_received);
+		WAIT_FOR_FLAG(test_stream->flag_audio_received);
 	}
 }
 

tests/bsim/bluetooth/audio/src/cap_acceptor_test.c

@@ -282,6 +282,7 @@ static void started_cb(struct bt_bap_stream *stream)
 	test_stream->valid_rx_cnt = 0U;
 	test_stream->seq_num = 0U;
 	test_stream->tx_cnt = 0U;
+	UNSET_FLAG(test_stream->flag_audio_received);
 
 	printk("Stream %p started\n", stream);
 	k_sem_give(&sem_broadcast_started);
@@ -333,6 +334,7 @@ static void unicast_stream_started(struct bt_bap_stream *stream)
 	test_stream->valid_rx_cnt = 0U;
 	test_stream->seq_num = 0U;
 	test_stream->tx_cnt = 0U;
+	UNSET_FLAG(test_stream->flag_audio_received);
 
 	printk("Started stream %p\n", stream);
 
@@ -796,7 +798,6 @@ static void init(void)
 		UNSET_FLAG(flag_base_received);
 		UNSET_FLAG(flag_pa_synced);
 		UNSET_FLAG(flag_pa_request);
-		UNSET_FLAG(flag_audio_received);
 		UNSET_FLAG(flag_base_metadata_updated);
 		UNSET_FLAG(flag_bis_sync_requested);
 
@@ -882,7 +883,11 @@ static void init(void)
 static void wait_for_data(void)
 {
 	printk("Waiting for data\n");
-	WAIT_FOR_FLAG(flag_audio_received);
+	ARRAY_FOR_EACH_PTR(broadcast_sink_streams, test_stream) {
+		if (audio_test_stream_is_streaming(test_stream)) {
+			WAIT_FOR_FLAG(test_stream->flag_audio_received);
+		}
+	}
 	printk("Data received\n");
 }
 

tests/bsim/bluetooth/audio/src/cap_handover_peripheral_test.c

@@ -769,10 +769,15 @@ static void create_and_sync_sink(void)
 
 static void wait_for_data(void)
 {
-	UNSET_FLAG(flag_audio_received);
-
 	LOG_DBG("Waiting for data");
-	WAIT_FOR_FLAG(flag_audio_received);
+
+	ARRAY_FOR_EACH_PTR(streams, test_stream) {
+		if (audio_test_stream_is_streaming(test_stream) &&
+		    bap_stream_rx_can_recv(&test_stream->stream.bap_stream)) {
+			WAIT_FOR_FLAG(test_stream->flag_audio_received);
+		}
+	}
+
 	LOG_DBG("Data received");
 }