Bluetooth: BAP: Remove ISO limitation on BASE parsing

BASE is now parsed on-the-fly on sink sync, removing
unnecessary restriction in intermediate parsed storage
and without requiring an excessive amount of memory.

Signed-off-by: Lars Knudsen <[email protected]>

Author: larsgk

include/zephyr/bluetooth/audio/bap.h

@@ -47,6 +47,9 @@ extern "C" {
 #define BT_BAP_BASS_MAX_SUBGROUPS 0
 #endif /* CONFIG_BT_BAP_BASS_MAX_SUBGROUPS*/
 
+/** Maximum size of BASE excluding service data header */
+#define BT_BASE_MAX_SIZE (UINT8_MAX - 1 /* type */ - BT_UUID_SIZE_16)
+
 /** An invalid Broadcast ID */
 #define BT_BAP_INVALID_BROADCAST_ID 0xFFFFFFFFU
 

subsys/bluetooth/audio/bap_base.c

@@ -30,7 +30,6 @@ LOG_MODULE_REGISTER(bt_bap_base, CONFIG_BT_BAP_BASE_LOG_LEVEL);
 /* The BASE and the following defines are defined by BAP v1.0.1, section 3.7.2.2 Basic Audio
  * Announcements
  */
-#define BASE_MAX_SIZE            (UINT8_MAX - 1 /* type */ - BT_UUID_SIZE_16)
 #define BASE_CODEC_ID_SIZE       (1 /* id */ + 2 /* cid */ + 2 /* vid */)
 #define BASE_PD_SIZE             3
 #define BASE_SUBGROUP_COUNT_SIZE 1
@@ -39,14 +38,14 @@ LOG_MODULE_REGISTER(bt_bap_base, CONFIG_BT_BAP_BASE_LOG_LEVEL);
 #define BASE_META_LEN_SIZE       1
 #define BASE_BIS_INDEX_SIZE      1
 #define BASE_BIS_CC_LEN_SIZE     1
-#define BASE_SUBGROUP_MAX_SIZE   (BASE_MAX_SIZE - BASE_PD_SIZE - BASE_SUBGROUP_COUNT_SIZE)
+#define BASE_SUBGROUP_MAX_SIZE   (BT_BASE_MAX_SIZE - BASE_PD_SIZE - BASE_SUBGROUP_COUNT_SIZE)
 #define BASE_SUBGROUP_MIN_SIZE                                                                     \
 	(BASE_NUM_BIS_SIZE + BASE_CODEC_ID_SIZE + BASE_CC_LEN_SIZE + BASE_META_LEN_SIZE +          \
 	 BASE_BIS_INDEX_SIZE + BASE_BIS_CC_LEN_SIZE)
 #define BASE_MIN_SIZE                                                                              \
 	(BT_UUID_SIZE_16 + BASE_PD_SIZE + BASE_SUBGROUP_COUNT_SIZE + BASE_SUBGROUP_MIN_SIZE)
 #define BASE_SUBGROUP_MAX_COUNT                                                                    \
-	((BASE_MAX_SIZE - BASE_PD_SIZE - BASE_SUBGROUP_COUNT_SIZE) / BASE_SUBGROUP_MIN_SIZE)
+	((BT_BASE_MAX_SIZE - BASE_PD_SIZE - BASE_SUBGROUP_COUNT_SIZE) / BASE_SUBGROUP_MIN_SIZE)
 
 static uint32_t base_pull_pd(struct net_buf_simple *net_buf)
 {
@@ -233,7 +232,7 @@ int bt_bap_base_get_size(const struct bt_bap_base *base)
 		return -EINVAL;
 	}
 
-	net_buf_simple_init_with_data(&net_buf, (void *)base, BASE_MAX_SIZE);
+	net_buf_simple_init_with_data(&net_buf, (void *)base, BT_BASE_MAX_SIZE);
 	base_pull_pd(&net_buf);
 	size += BASE_PD_SIZE;
 	subgroup_count = net_buf_simple_pull_u8(&net_buf);
@@ -301,7 +300,7 @@ int bt_bap_base_get_subgroup_count(const struct bt_bap_base *base)
 		return -EINVAL;
 	}
 
-	net_buf_simple_init_with_data(&net_buf, (void *)base, BASE_MAX_SIZE);
+	net_buf_simple_init_with_data(&net_buf, (void *)base, BT_BASE_MAX_SIZE);
 	base_pull_pd(&net_buf);
 	subgroup_count = net_buf_simple_pull_u8(&net_buf);
 
@@ -329,7 +328,7 @@ int bt_bap_base_foreach_subgroup(const struct bt_bap_base *base,
 		return -EINVAL;
 	}
 
-	net_buf_simple_init_with_data(&net_buf, (void *)base, BASE_MAX_SIZE);
+	net_buf_simple_init_with_data(&net_buf, (void *)base, BT_BASE_MAX_SIZE);
 	base_pull_pd(&net_buf);
 	subgroup_count = net_buf_simple_pull_u8(&net_buf);