samples: Bluetooth: Minor improvements for broadcast audio sink

Increases some of the timeouts so that when using this sample
against other interactive devices (such as a phone or the
Zephyr audio shell), then it's easier to do it in time.

Also updates a few of the printks and ensures that we are not
doing name filtering when we have been requested to sync to
a specific broadcast source by a broadcast assistant.

The test for the sample has also been modified to have a longer
timeout to accomodate for the new semaphore timeout values.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>

samples/bluetooth/broadcast_audio_sink/Kconfig

@@ -22,7 +22,7 @@ config SCAN_SELF
 config SCAN_DELAY
 	int "Delay before starting scan (in seconds)"
 	range 0 255
-	default 5
+	default 10
 	depends on SCAN_SELF
 	help
 	  Time to advertise connectable for a Broadcast Assistant to connect

samples/bluetooth/broadcast_audio_sink/src/main.c

@@ -26,7 +26,7 @@
 BUILD_ASSERT(IS_ENABLED(CONFIG_SCAN_SELF) || IS_ENABLED(CONFIG_SCAN_OFFLOAD),
 	     "Either SCAN_SELF or SCAN_OFFLOAD must be enabled");
 
-#define SEM_TIMEOUT K_SECONDS(10)
+#define SEM_TIMEOUT                 K_SECONDS(60)
 #define BROADCAST_ASSISTANT_TIMEOUT K_SECONDS(120) /* 2 minutes */
 
 #if defined(CONFIG_SCAN_SELF)
@@ -123,6 +123,8 @@ static uint8_t sink_broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE];
 
 uint64_t total_rx_iso_packet_count; /* This value is exposed to test code */
 
+static int stop_adv(void);
+
 #if defined(CONFIG_USB_DEVICE_AUDIO)
 static int16_t usb_audio_data[MAX_NUM_SAMPLES_STEREO] = {0};
 static int16_t usb_audio_data_stereo[MAX_NUM_SAMPLES_STEREO] = {0};
@@ -652,6 +654,9 @@ static int pa_sync_req_cb(struct bt_conn *conn,
 {
 	int err;
 
+	printk("Received request to sync to PA (PAST %savailble): %u\n", past_avail ? "" : "not ",
+	       recv_state->pa_sync_state);
+
 	req_recv_state = recv_state;
 
 	if (recv_state->pa_sync_state == BT_BAP_PA_STATE_SYNCED ||
@@ -887,7 +892,12 @@ static void broadcast_scan_recv(const struct bt_le_scan_recv_info *info, struct
 {
 	if (info->interval != 0U) {
 		/* call to bt_data_parse consumes netbufs so shallow clone for verbose output */
-		if (strlen(CONFIG_TARGET_BROADCAST_NAME) > 0U) {
+
+		/* If req_recv_state is NULL then we have been requested by a broadcast assistant to
+		 * sync to a specific broadcast source. In that case we do not apply our own
+		 * broadcast name filter.
+		 */
+		if (req_recv_state != NULL && strlen(CONFIG_TARGET_BROADCAST_NAME) > 0U) {
 			struct net_buf_simple buf_copy;
 			char name[NAME_LEN] = {0};
 
@@ -1036,24 +1046,10 @@ static int reset(void)
 
 				return err;
 			}
-		} else if (ext_adv != NULL) { /* advertising still running */
+		}
-			err = bt_le_ext_adv_stop(ext_adv);
-			if (err) {
-				printk("Stopping advertising set failed (err %d)\n",
-				       err);
 
-				return err;
+		if (ext_adv != NULL) {
-			}
+			stop_adv();
-
-			err = bt_le_ext_adv_delete(ext_adv);
-			if (err) {
-				printk("Deleting advertising set failed (err %d)\n",
-				       err);
-
-				return err;
-			}
-
-			ext_adv = NULL;
 		}
 
 		k_sem_reset(&sem_connected);
@@ -1198,6 +1194,7 @@ int main(void)
 				/* Wait for the PA request to determine if we
 				 * should start scanning, or wait for PAST
 				 */
+				printk("Waiting for PA sync request\n");
 				err = k_sem_take(&sem_pa_request,
 						 BROADCAST_ASSISTANT_TIMEOUT);
 				if (err != 0) {
@@ -1279,17 +1276,17 @@ wait_for_pa_sync:
 		/* sem_broadcast_code_received is also given if the
 		 * broadcast is not encrypted
 		 */
-		printk("Waiting for broadcast code OK\n");
+		printk("Waiting for broadcast code\n");
 		err = k_sem_take(&sem_broadcast_code_received, SEM_TIMEOUT);
 		if (err != 0) {
-			printk("sem_syncable timed out, resetting\n");
+			printk("sem_broadcast_code_received timed out, resetting\n");
 			continue;
 		}
 
 		printk("Waiting for BIS sync request\n");
 		err = k_sem_take(&sem_bis_sync_requested, SEM_TIMEOUT);
 		if (err != 0) {
-			printk("sem_syncable timed out, resetting\n");
+			printk("sem_bis_sync_requested timed out, resetting\n");
 			continue;
 		}
 

tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/src/broadcast_audio_sink_test.c

@@ -11,7 +11,7 @@
 #include "time_machine.h"
 #include "bstests.h"
 
-#define WAIT_TIME 10 /* Seconds */
+#define WAIT_TIME 120 /* Seconds */
 
 #define PASS_THRESHOLD 100 /* Audio packets */
 

tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/tests_scripts/broadcast_audio.sh

@@ -24,6 +24,6 @@ Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_samples_broadcast_audio_sink_pr
   -testid=broadcast_audio_sink
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=20e6 $@
+  -D=2 -sim_length=120e6 $@
 
 wait_for_background_jobs #Wait for all programs in background and return != 0 if any fails