Samples: Bluetooth: CAP Acceptor broadcast support

Add broadcast support for the CAP acceptor sample.

This adds new sample-specific Kconfig options to help
select the right Kconfig options based on whether
unicast, broadcast or both is being used.

The babblesim implemented for the broadcast has been expanded
to verify that the CAP acceptor receives the broadcast audio.

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

Author: Thalley

samples/bluetooth/cap_acceptor/CMakeLists.txt

@@ -6,7 +6,9 @@ project(cap_acceptor)
 
 target_sources(app PRIVATE
   src/main.c
-  src/cap_acceptor_unicast.c
 )
 
+zephyr_sources_ifdef(CONFIG_SAMPLE_UNICAST src/cap_acceptor_unicast.c)
+zephyr_sources_ifdef(CONFIG_SAMPLE_BROADCAST src/cap_acceptor_broadcast.c)
+
 zephyr_library_include_directories(${ZEPHYR_BASE}/samples/bluetooth)

samples/bluetooth/cap_acceptor/Kconfig

@@ -0,0 +1,48 @@
+# Copyright (c) 2022 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"
+	default y
+	select BT_BAP_UNICAST_SERVER
+	select BT_ISO_PERIPHERAL
+	select BT_ASCS
+	select BT_PAC_SNK
+	select BT_PAC_SNK_LOC
+	select BT_PAC_SRC
+	select BT_PAC_SRC_LOC
+	select BT_CTLR_PERIPHERAL_ISO if BT_CTLR
+	help
+	  If set to true, the sample will start advertising connectable for
+	  Broadcast Assistants.
+
+config SAMPLE_BROADCAST
+	bool "Whether or not to search for CAP acceptors for unicast audio"
+	default y if !SAMPLE_UNICAST
+	select BT_ISO_SYNC_RECEIVER
+	select BT_BAP_SCAN_DELEGATOR
+	select BT_BAP_BROADCAST_SINK
+	select BT_PAC_SNK
+	select BT_PAC_SNK_LOC
+	select BT_PER_ADV_SYNC_TRANSFER_RECEIVER if !BT_CTLR || BT_CTLR_SYNC_TRANSFER_RECEIVER_SUPPORT
+	select BT_CTLR_SYNC_ISO if BT_CTLR
+	help
+	  If set to true, the sample will start advertising syncable audio streams
+
+config SAMPLE_SCAN_SELF
+	bool "Whether to scan for Broadcast Sources without Broadcast Assistant"
+	depends on SAMPLE_BROADCAST
+	help
+	  If set to true, the sample will start scanning for Broadcast Sources
+	  without waiting for a Broadcast Assistant to connect.
+
+config SAMPLE_TARGET_BROADCAST_NAME
+	string "Target Broadcast Device Name when self-scanning"
+	default ""
+	help
+	  Name of target broadcast device. If not empty string, sink device
+	  will only listen to the specified broadcast source. Not case sensitive.
+
+source "Kconfig.zephyr"

samples/bluetooth/cap_acceptor/README.rst

@@ -9,6 +9,7 @@ Overview
 
 Application demonstrating the CAP Acceptor functionality.
 Starts by advertising for a CAP Initiator to connect and set up available streams.
+It can also be configured to start scanning for broadcast audio streams by itself.
 
 This sample can be found under :zephyr_file:`samples/bluetooth/cap_acceptor` in the Zephyr tree.
 

samples/bluetooth/cap_acceptor/overlay-bt_ll_sw_split.conf

@@ -2,11 +2,9 @@
 CONFIG_BT_LL_SW_SPLIT=y
 
 # Zephyr Controller tested maximum advertising data that can be set in a single HCI command
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
 CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
 
-# Enable support for central ISO in Zephyr Bluetooth Controller
-CONFIG_BT_CTLR_PERIPHERAL_ISO=y
-
 # Support the highest SDU size required by any BAP LC3 presets (155) + 8 bytes of HCI ISO Data
 # packet overhead (the Packet_Sequence_Number, ISO_SDU_Length, Packet_Status_Flag fields; and
 # the optional Time_Stamp field, if supplied)

samples/bluetooth/cap_acceptor/prj.conf

@@ -1,23 +1,16 @@
 CONFIG_BT=y
 CONFIG_LOG=y
 CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_ISO_PERIPHERAL=y
-CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_EXT_ADV=y
 CONFIG_BT_DEVICE_NAME="CAP Acceptor"
-
 CONFIG_BT_AUDIO=y
-
 CONFIG_BT_SMP=y
 CONFIG_BT_KEYS_OVERWRITE_OLDEST=y
 
 # CAP
 CONFIG_BT_CAP_ACCEPTOR=y
 
-# BAP support
-CONFIG_BT_BAP_UNICAST_SERVER=y
-
 # Mandatory to support at least 1 for ASCS
 CONFIG_BT_ATT_PREPARE_COUNT=1
 
@@ -28,9 +21,3 @@ CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=1
 
 # Support an ISO channel per ASE
 CONFIG_BT_ISO_MAX_CHAN=2
-
-# PACS
-CONFIG_BT_PAC_SNK=y
-CONFIG_BT_PAC_SNK_LOC=y
-CONFIG_BT_PAC_SRC=y
-CONFIG_BT_PAC_SRC_LOC=y

samples/bluetooth/cap_acceptor/src/cap_acceptor.h

@@ -38,6 +38,14 @@ struct peer_config {
  */
 int init_cap_acceptor_unicast(struct peer_config *peer);
 
+/**
+ * @brief Initialize the unicast part of the CAP Acceptor
+ *
+ * @retval 0 if success
+ * @retval -ENOEXEC if callbacks failed to be registered
+ */
+int init_cap_acceptor_broadcast(void);
+
 /**
  * @brief Request to allocate a CAP stream
  *