Add test BAP/BSRC/SCC/BV-38-C

- Add test BAP/BSRC/SCC/BV-38-C
- Add bap_broadcast_source_setup_v2, includes broadcast_id

Signed-off-by: Graham Wacey <graham.wacey@nordicsemi.no>
Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>

Author: gWacey

autopts/ptsprojects/stack/layers/bap.py

@@ -25,8 +25,10 @@ def __init__(self):
     def __init__(self):
         self.peers = {}
         self.ase_configs = []
-        self.broadcast_id = 0x1000000  # Invalid Broadcast ID
+        self.broadcast_id = None
+        self.broadcast_id_2 = None
         self.broadcast_code = ''
+        self.hdl_wid_114_cnt = 0
         self.event_queues = {
             defs.BTP_BAP_EV_DISCOVERY_COMPLETED: [],
             defs.BTP_BAP_EV_CODEC_CAP_FOUND: [],
@@ -55,6 +57,12 @@ def get_peer(self, addr_type, addr):
     def set_broadcast_code(self, broadcast_code):
         self.broadcast_code = broadcast_code
 
+    def set_broadcast_id(self, broadcast_id):
+        self.broadcast_id = broadcast_id
+
+    def set_broadcast_id_2(self, broadcast_id):
+        self.broadcast_id_2 = broadcast_id
+
     def event_received(self, event_type, event_data_tuple):
         if event_type in self.event_handlers:
             self.event_handlers[event_type](*event_data_tuple)

autopts/ptsprojects/zephyr/bap.py

@@ -24,7 +24,9 @@
 from autopts.pybtp.types import Addr, AdType, UUID, AdFlags
 from autopts.utils import ResultWithFlag
 
-broadcast_code = '0102680553F1415AA265BBAFC6EA03B8'
+BROADCAST_CODE = '0102680553F1415AA265BBAFC6EA03B8'
+BROADCAST_ID = 0x123456
+BROADCAST_ID_2 = 0x234567
 
 
 def set_pixits(ptses):
@@ -52,7 +54,9 @@ def set_pixits(ptses):
     pts.set_pixit("BAP", "TSPX_iut_ATT_transport", "ATT Bearer on LE Transport")
     pts.set_pixit("BAP", "TSPX_VS_Codec_ID", "ffff")
     pts.set_pixit("BAP", "TSPX_VS_Company_ID", "ffff")
-    pts.set_pixit("BAP", "TSPX_broadcast_code", broadcast_code)
+    pts.set_pixit("BAP", "TSPX_broadcast_code", BROADCAST_CODE)
+    pts.set_pixit("BAP", "TSPX_Broadcast_ID", BROADCAST_ID)
+    pts.set_pixit("BAP", "TSPX_Broadcast_ID_2", BROADCAST_ID_2)
 
     if len(ptses) < 2:
         return
@@ -72,7 +76,7 @@ def set_pixits(ptses):
     pts2.set_pixit("BAP", "TSPX_iut_ATT_transport", "ATT Bearer on LE Transport")
     pts2.set_pixit("BAP", "TSPX_VS_Codec_ID", "ffff")
     pts2.set_pixit("BAP", "TSPX_VS_Company_ID", "ffff")
-    pts2.set_pixit("BAP", "TSPX_broadcast_code", broadcast_code)
+    pts2.set_pixit("BAP", "TSPX_broadcast_code", BROADCAST_CODE)
 
 
 def test_cases(ptses):
@@ -124,9 +128,11 @@ def set_addr(addr):
                       TestFunc(btp.core_reg_svc_bap),
                       TestFunc(stack.ascs_init),
                       TestFunc(stack.bap_init),
-                      TestFunc(lambda: stack.bap.set_broadcast_code(broadcast_code)),
+                      TestFunc(lambda: stack.bap.set_broadcast_code(BROADCAST_CODE)),
                       TestFunc(lambda: set_addr(
                           stack.gap.iut_addr_get_str())),
+                      TestFunc(lambda: stack.bap.set_broadcast_id(BROADCAST_ID)),
+                      TestFunc(lambda: stack.bap.set_broadcast_id_2(BROADCAST_ID_2)),
                       ]
 
     pre_conditions_server = pre_conditions + [

autopts/pybtp/btp/bap.py

@@ -74,6 +74,8 @@
     'set_broadcast_code': (defs.BTP_SERVICE_ID_BAP, defs.BTP_BAP_CMD_SET_BROADCAST_CODE,
                            CONTROLLER_INDEX),
     'bap_send_past': (defs.BTP_SERVICE_ID_BAP, defs.BTP_BAP_CMD_SEND_PAST, CONTROLLER_INDEX),
+    'broadcast_source_setup_v2': (defs.BTP_SERVICE_ID_BAP, defs.BTP_BAP_CMD_BROADCAST_SOURCE_SETUP_V2,
+                                  CONTROLLER_INDEX),
 }
 
 
@@ -166,6 +168,46 @@ def bap_broadcast_source_setup(
     return broadcast_id
 
 
+def bap_broadcast_source_setup_v2(
+        broadcast_id, streams_per_subgroup, subgroups, coding_format, vid, cid,
+        codec_ltvs, sdu_interval, framing, max_sdu, retransmission_number,
+        max_transport_latency, presentation_delay):
+
+    logging.debug(f"{bap_broadcast_source_setup_v2.__name__}")
+
+    iutctl = get_iut()
+    data = bytearray()
+    data += int.to_bytes(broadcast_id, 3, 'little')
+    data += struct.pack('B', streams_per_subgroup)
+    data += struct.pack('B', subgroups)
+
+    # QoS Config
+    data += int.to_bytes(sdu_interval, 3, 'little')
+    data += struct.pack('B', framing)
+    data += struct.pack('<H', max_sdu)
+    data += struct.pack('B', retransmission_number)
+    data += struct.pack('<H', max_transport_latency)
+    data += int.to_bytes(presentation_delay, 3, 'little')
+
+    # Codec Config
+    data += struct.pack('B', coding_format)
+    data += struct.pack('<H', vid)
+    data += struct.pack('<H', cid)
+    codec_ltvs_len = len(codec_ltvs)
+    data += struct.pack('B', codec_ltvs_len)
+    if codec_ltvs_len:
+        data += codec_ltvs
+
+    iutctl.btp_socket.send(*BAP['broadcast_source_setup_v2'], data=data)
+
+    tuple_data = bap_command_rsp_succ()[0]
+    gap_settings = int.from_bytes(tuple_data[:4], 'little')
+    broadcast_id = int.from_bytes(tuple_data[4:7], 'little')
+    __gap_current_settings_update(gap_settings)
+
+    return broadcast_id
+
+
 def bap_broadcast_source_release(broadcast_id):
     logging.debug(f"{bap_broadcast_source_release.__name__}")
 

autopts/pybtp/defs.py

@@ -663,6 +663,7 @@ def BIT(bit):
 BTP_BAP_CMD_MODIFY_BROADCAST_SRC = 0x16
 BTP_BAP_CMD_SET_BROADCAST_CODE = 0x17
 BTP_BAP_CMD_SEND_PAST = 0x18
+BTP_BAP_CMD_BROADCAST_SOURCE_SETUP_V2 = 0x19
 BTP_BAP_EV_DISCOVERY_COMPLETED = 0x80
 BTP_BAP_EV_CODEC_CAP_FOUND = 0x81
 BTP_BAP_EV_ASE_FOUND = 0x82

autopts/wid/bap.py

@@ -21,6 +21,8 @@
 from autopts.ptsprojects.testcase import MMI
 from autopts.pybtp import btp
 from autopts.pybtp.btp import pts_addr_get, pts_addr_type_get, ascs_add_ase_to_cis, lt2_addr_get, lt2_addr_type_get
+from autopts.pybtp.btp.btp import CONTROLLER_INDEX, btp_hdr_check, get_iut_method as get_iut, pts_addr_get, \
+    pts_addr_type_get
 from autopts.pybtp.types import *
 from autopts.wid import generic_wid_hdl
 
@@ -240,6 +242,7 @@ def hdl_wid_114(params: WIDParams):
         'BAP/BSRC/SCC/BV-30-C': '48_4_2',
         'BAP/BSRC/SCC/BV-31-C': '48_5_2',
         'BAP/BSRC/SCC/BV-32-C': '48_6_2',
+        'BAP/BSRC/SCC/BV-38-C': '16_2_1',
         # Cases with 1 BIS:
         'BAP/BSRC/STR/BV-01-C': '8_1_1',
         'BAP/BSRC/STR/BV-02-C': '8_2_1',
@@ -276,6 +279,15 @@ def hdl_wid_114(params: WIDParams):
         'BAP/BSRC/STR/BV-33-C': '48_6_1',
     }
 
+    stack = get_stack()
+
+    if stack.bap.hdl_wid_114_cnt == 0:
+        broadcast_id = stack.bap.broadcast_id
+    elif stack.bap.hdl_wid_114_cnt == 1:
+        broadcast_id = stack.bap.broadcast_id_2
+    else:
+        raise ValuError("hdl_wid_114 is not 0 or 1")
+
     if params.test_case_name in configurations:
         qos_set_name = configurations[params.test_case_name]
         coding_format = 0x06
@@ -305,12 +317,15 @@ def hdl_wid_114(params: WIDParams):
 
     presentation_delay = 40000
     subgroups = 1
-    broadcast_id = btp.bap_broadcast_source_setup(
-        streams_per_subgroup, subgroups, coding_format, vid, cid,
-        codec_ltvs_bytes, *qos_config, presentation_delay)
 
-    stack = get_stack()
-    stack.bap.broadcast_id = broadcast_id
+    if params.test_case_name.startswith("BAP/BSRC/SCC/BV-38-C"):
+        btp.bap_broadcast_source_setup_v2(broadcast_id, streams_per_subgroup, subgroups,
+                                          coding_format, vid, cid, codec_ltvs_bytes,
+                                          *qos_config, presentation_delay)
+    else:
+        broadcast_id = btp.bap_broadcast_source_setup(streams_per_subgroup, subgroups,
+                                                      coding_format, vid, cid, codec_ltvs_bytes,
+                                                      *qos_config, presentation_delay)
 
     btp.bap_broadcast_adv_start(broadcast_id)
 
@@ -325,6 +340,8 @@ def hdl_wid_114(params: WIDParams):
             # Buffer full
             pass
 
+    stack.bap.hdl_wid_114_cnt += 1
+
     return True
 
 
@@ -2015,12 +2032,13 @@ def hdl_wid_380(_: WIDParams):
                                              audio_locations, octets_per_frame,
                                              frames_per_sdu)
 
+    broadcast_id = 0x123456
     presentation_delay = 40000
     streams_per_subgroup = 2
     subgroups = 1
     broadcast_id = btp.bap_broadcast_source_setup(
         streams_per_subgroup, subgroups, coding_format, vid, cid,
-        codec_ltvs_bytes, *qos_config, presentation_delay)
+        codec_ltvs_bytes, *qos_config, presentation_delay, broadcast_id)
 
     stack.bap.broadcast_id = broadcast_id
 

doc/btp_bap.txt

@@ -338,6 +338,30 @@ Commands and responses:
                 In case of a success, the IUT continues processing the command
                 asynchronously.
 
+    Opcode 0x19 - Broadcast Source Setup v2
+                Controller Index:       <controller id>
+                Command parameters:     Broadcast ID (3 octets)
+                                        Streams Per Subgroup (1 octet)
+                                        Subgroups (1 octet)
+                                        Sdu Interval (3 octets)
+                                        Framing (1 octet)
+                                        Max SDU (2 octets)
+                                        Retransmission Num (1 octet)
+                                        Max Transport Latency (2 octets)
+                                        Presentation Delay (3 octets)
+                                        Coding Format (1 octet)
+                                        VID (2 octets)
+                                        CID (2 octets)
+                                        LTVs length (1 octet)
+                                        LTVs (varies)
+                Response parameters:    Current_Settings (4 Octets) (see btp_gap.txt)
+
+        This command is used to set up and configure a Broadcast Source
+        with the given Codec Config, with the addition of a fixed broadcast ID.
+        In case of an error, the error status response will be returned.
+        In case of a success, the IUT continues processing the command
+        asynchronously.
+
 Events:
         Opcode 0x80 - Discover and Subscribe Completed event