Commit aa990ae6 authored by Emil Gydesen's avatar Emil Gydesen Committed by Fabio Baltieri
Browse files

Bluetooth: Audio: Refactor bt_audio_codec_cap to flat arrays 



Refactor the bt_audio_codec_cap to use flat arrays to store
metadata and codec specific capabilities.

The purpose of this is to make it easier to copy the data
between layers, but also to support non-LTV data for non-LC3
codec capabilities.

Signed-off-by: default avatarEmil Gydesen <emil.gydesen@nordicsemi.no>
parent 00e94614

include/zephyr/bluetooth/audio/audio.h

+54 −21
Original line number Diff line number Diff line
@@ -199,7 +199,18 @@ struct bt_audio_codec_data { 
	}



/**

 *  @brief Helper to declare @ref bt_audio_codec_cfg or @ref bt_audio_codec_cap structure

 * @brief Helper to declare elements of bt_audio_codec_cap arrays

 *

 * This macro is mainly for creating an array of struct bt_audio_codec_cap data arrays.

 *

 * @param _type Type of advertising data field

 * @param _bytes Variable number of single-byte parameters

 */

#define BT_AUDIO_CODEC_CAP_DATA(_type, _bytes...)                                                  \

	(sizeof((uint8_t)_type) + sizeof((uint8_t[]){_bytes})), (_type), _bytes



/**

 *  @brief Helper to declare @ref bt_audio_codec_cfg

 *

 *  @param _id Codec ID

 *  @param _cid Company ID
@@ -207,8 +218,8 @@ struct bt_audio_codec_data { 
 *  @param _data Codec Specific Data in LVT format

 *  @param _meta Codec Specific Metadata in LVT format

 */

#define BT_AUDIO_CODEC(_id, _cid, _vid, _data, _meta) \

	{ \

#define BT_AUDIO_CODEC_CFG(_id, _cid, _vid, _data, _meta)                                          \

	((struct bt_audio_codec_cfg){                                                              \

		/* Use HCI data path as default, can be overwritten by application */              \

		.path_id = BT_ISO_DATA_PATH_HCI,                                                   \

		.id = _id,                                                                         \
@@ -218,7 +229,29 @@ struct bt_audio_codec_data { 
		.data = _data,                                                                     \

		.meta_count = ARRAY_SIZE(((struct bt_audio_codec_data[])_meta)),                   \

		.meta = _meta,                                                                     \

	}

	})



/**

 *  @brief Helper to declare @ref bt_audio_codec_cap structure

 *

 *  @param _id Codec ID

 *  @param _cid Company ID

 *  @param _vid Vendor ID

 *  @param _data Codec Specific Data in LVT format

 *  @param _meta Codec Specific Metadata in LVT format

 */

#define BT_AUDIO_CODEC_CAP(_id, _cid, _vid, _data, _meta)                                          \

	((struct bt_audio_codec_cap){                                                              \

		/* Use HCI data path as default, can be overwritten by application */              \

		.path_id = BT_ISO_DATA_PATH_HCI,                                                   \

		.id = (_id),                                                                       \

		.cid = (_cid),                                                                     \

		.vid = (_vid),                                                                     \

		.data_len = sizeof((uint8_t[])_data),                                              \

		.data = _data,                                                                     \

		.meta_len = sizeof((uint8_t[])_meta),                                              \

		.meta = _meta,                                                                     \

	})



/** @brief Location values for BT Audio.

 *
@@ -302,18 +335,18 @@ struct bt_audio_codec_cap { 
	uint16_t cid;

	/** Codec Company Vendor ID */

	uint16_t vid;

#if defined(CONFIG_BT_AUDIO_CODEC_CAP_MAX_DATA_COUNT)

#if CONFIG_BT_AUDIO_CODEC_CAP_MAX_DATA_SIZE > 0

	/** Codec Specific Capabilities Data count */

	size_t data_count;

	size_t data_len;

	/** Codec Specific Capabilities Data */

	struct bt_audio_codec_data data[CONFIG_BT_AUDIO_CODEC_CAP_MAX_DATA_COUNT];

#endif /* CONFIG_BT_AUDIO_CODEC_CAP_MAX_DATA_COUNT */

#if defined(CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_COUNT)

	uint8_t data[CONFIG_BT_AUDIO_CODEC_CAP_MAX_DATA_SIZE];

#endif /* CONFIG_BT_AUDIO_CODEC_CAP_MAX_DATA_SIZE > 0 */

#if defined(CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE)

	/** Codec Specific Capabilities Metadata count */

	size_t meta_count;

	size_t meta_len;

	/** Codec Specific Capabilities Metadata */

	struct bt_audio_codec_data meta[CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_COUNT];

#endif /* CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_COUNT */

	uint8_t meta[CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE];

#endif /* CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE */

};



/** @brief Codec specific configuration structure. */

include/zephyr/bluetooth/audio/lc3.h

+31 −21
Original line number Diff line number Diff line
@@ -254,38 +254,48 @@ enum bt_audio_codec_config_type { 
 * If the flags argument is != 1 it will evaluate to the third argument which inserts a LTV

 * entry for the max_frames_per_sdu value.

 */

#define BT_AUDIO_CODEC_LC3_DATA(_freq, _duration, _chan_count, _len_min, _len_max,                 \



#define BT_AUDIO_CODEC_CAP_LC3_DATA(_freq, _duration, _chan_count, _len_min, _len_max,             \

				    _max_frames_per_sdu)                                           \

	{                                                                                          \

		BT_AUDIO_CODEC_DATA(BT_AUDIO_CODEC_LC3_FREQ, BT_BYTES_LIST_LE16(_freq)),           \

		BT_AUDIO_CODEC_DATA(BT_AUDIO_CODEC_LC3_DURATION, _duration),                       \

		BT_AUDIO_CODEC_DATA(BT_AUDIO_CODEC_LC3_CHAN_COUNT, _chan_count),                   \

		BT_AUDIO_CODEC_DATA(BT_AUDIO_CODEC_LC3_FRAME_LEN,                                  \

		BT_AUDIO_CODEC_CAP_DATA(BT_AUDIO_CODEC_LC3_FREQ, BT_BYTES_LIST_LE16(_freq)),       \

		BT_AUDIO_CODEC_CAP_DATA(BT_AUDIO_CODEC_LC3_DURATION, (_duration)),                 \

		BT_AUDIO_CODEC_CAP_DATA(BT_AUDIO_CODEC_LC3_CHAN_COUNT, (_chan_count)),             \

		BT_AUDIO_CODEC_CAP_DATA(BT_AUDIO_CODEC_LC3_FRAME_LEN,                              \

					BT_BYTES_LIST_LE16(_len_min),                              \

				    BT_BYTES_LIST_LE16(_len_max))                                  \

					BT_BYTES_LIST_LE16(_len_max)),                             \

		COND_CODE_1(_max_frames_per_sdu, (),                                               \

			    (, BT_AUDIO_CODEC_DATA(BT_AUDIO_CODEC_LC3_FRAME_COUNT,                 \

								   _max_frames_per_sdu)))          \

			    (BT_AUDIO_CODEC_CAP_DATA(BT_AUDIO_CODEC_LC3_FRAME_COUNT,               \

						     (_max_frames_per_sdu)))),                     \

	}



/**

 *  @brief Helper to declare LC3 codec metadata

 */

#define BT_AUDIO_CODEC_LC3_META(_prefer_context)                                                   \

#define BT_AUDIO_CODEC_CAP_LC3_META(_prefer_context)                                               \

	{                                                                                          \

		BT_AUDIO_CODEC_DATA(BT_AUDIO_METADATA_TYPE_PREF_CONTEXT,                           \

		BT_AUDIO_CODEC_CAP_DATA(BT_AUDIO_METADATA_TYPE_PREF_CONTEXT,                       \

					BT_BYTES_LIST_LE16(_prefer_context))                       \

	}



/**

 * @brief Helper to declare LC3 codec

 *

 * @param _freq Supported Sampling Frequencies bitfield (see BT_AUDIO_CODEC_LC3_FREQ_*)

 * @param _duration Supported Frame Durations bitfield (see BT_AUDIO_CODEC_LC3_DURATION_*)

 * @param _chan_count Supported channels (see @ref BT_AUDIO_CODEC_LC3_CHAN_COUNT_SUPPORT)

 * @param _len_min Minimum number of octets supported per codec frame

 * @param _len_max Maximum number of octets supported per codec frame

 * @param _max_frames_per_sdu Supported maximum codec frames per SDU

 * @param _prefer_context Preferred contexts (@ref bt_audio_context)

 *

 */

#define BT_AUDIO_CODEC_LC3(_freq, _duration, _chan_count, _len_min, _len_max, _max_frames_per_sdu, \

			   _prefer_context)                                                        \

	BT_AUDIO_CODEC(BT_AUDIO_CODEC_LC3_ID, 0x0000, 0x0000,                                      \

		       BT_AUDIO_CODEC_LC3_DATA(_freq, _duration, _chan_count, _len_min, _len_max,  \

					       _max_frames_per_sdu),                               \

		       BT_AUDIO_CODEC_LC3_META(_prefer_context))

#define BT_AUDIO_CODEC_CAP_LC3(_freq, _duration, _chan_count, _len_min, _len_max,                  \

			       _max_frames_per_sdu, _prefer_context)                               \

	BT_AUDIO_CODEC_CAP(BT_AUDIO_CODEC_LC3_ID, 0x0000, 0x0000,                                  \

			   BT_AUDIO_CODEC_CAP_LC3_DATA(_freq, _duration, _chan_count, _len_min,    \

						       _len_max, _max_frames_per_sdu),             \

			   BT_AUDIO_CODEC_CAP_LC3_META(_prefer_context))



/**

 *  @brief Helper to declare LC3 codec data configuration
@@ -332,7 +342,7 @@ enum bt_audio_codec_config_type { 
 *  @param _stream_context  Stream context (BT_AUDIO_CONTEXT_*)

 */

#define BT_AUDIO_CODEC_LC3_CONFIG(_freq, _duration, _loc, _len, _frames_per_sdu, _stream_context)  \

	BT_AUDIO_CODEC(                                                                            \

	BT_AUDIO_CODEC_CFG(                                                                        \

		BT_AUDIO_CODEC_LC3_ID, 0x0000, 0x0000,                                             \

		BT_AUDIO_CODEC_LC3_CONFIG_DATA(_freq, _duration, _loc, _len, _frames_per_sdu),     \

		BT_AUDIO_CODEC_LC3_CONFIG_META(_stream_context))

samples/bluetooth/broadcast_audio_sink/src/main.c

+4 −2
Original line number Diff line number Diff line
@@ -51,8 +51,10 @@ static struct bt_bap_stream *streams_p[ARRAY_SIZE(streams)]; 
static struct bt_conn *broadcast_assistant_conn;

static struct bt_le_ext_adv *ext_adv;



static struct bt_audio_codec_cap codec_cap = BT_AUDIO_CODEC_LC3_CONFIG_16_2(

	BT_AUDIO_LOCATION_FRONT_LEFT, BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED);

static struct bt_audio_codec_cap codec_cap = BT_AUDIO_CODEC_CAP_LC3(

	BT_AUDIO_CODEC_LC3_FREQ_16KHZ | BT_AUDIO_CODEC_LC3_FREQ_24KHZ,

	BT_AUDIO_CODEC_LC3_DURATION_10, BT_AUDIO_CODEC_LC3_CHAN_COUNT_SUPPORT(1), 40u, 60u, 1u,

	(BT_AUDIO_CONTEXT_TYPE_CONVERSATIONAL | BT_AUDIO_CONTEXT_TYPE_MEDIA));



/* Create a mask for the maximum BIS we can sync to using the number of streams

 * we have. We add an additional 1 since the bis indexes start from 1 and not

samples/bluetooth/hap_ha/src/bap_unicast_sr.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ NET_BUF_POOL_FIXED_DEFINE(tx_pool, CONFIG_BT_ASCS_ASE_SRC_COUNT, 
			  BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU),

			  CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);



static struct bt_audio_codec_cap lc3_codec_cap = BT_AUDIO_CODEC_LC3(

static struct bt_audio_codec_cap lc3_codec_cap = BT_AUDIO_CODEC_CAP_LC3(

	BT_AUDIO_CODEC_LC3_FREQ_16KHZ | BT_AUDIO_CODEC_LC3_FREQ_24KHZ,

	BT_AUDIO_CODEC_LC3_DURATION_10, BT_AUDIO_CODEC_LC3_CHAN_COUNT_SUPPORT(1), 40u, 60u, 1u,

	(BT_AUDIO_CONTEXT_TYPE_CONVERSATIONAL | BT_AUDIO_CONTEXT_TYPE_MEDIA));

samples/bluetooth/tmap_bmr/src/bap_broadcast_sink.c

+3 −4
Original line number Diff line number Diff line
@@ -55,10 +55,9 @@ static struct bt_le_per_adv_sync *bcast_pa_sync; 
static struct bt_bap_stream streams[CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT];

struct bt_bap_stream *streams_p[ARRAY_SIZE(streams)];



static struct bt_audio_codec_cap codec = BT_AUDIO_CODEC_LC3(

	BT_AUDIO_CODEC_LC3_FREQ_48KHZ,

	BT_AUDIO_CODEC_LC3_DURATION_10, BT_AUDIO_CODEC_LC3_CHAN_COUNT_SUPPORT(1), 40u, 60u, 1u,

	(BT_AUDIO_CONTEXT_TYPE_MEDIA));

static struct bt_audio_codec_cap codec = BT_AUDIO_CODEC_CAP_LC3(

	BT_AUDIO_CODEC_LC3_FREQ_48KHZ, BT_AUDIO_CODEC_LC3_DURATION_10,

	BT_AUDIO_CODEC_LC3_CHAN_COUNT_SUPPORT(1), 40u, 60u, 1u, (BT_AUDIO_CONTEXT_TYPE_MEDIA));



/* Create a mask for the maximum BIS we can sync to using the number of streams

 * we have. We add an additional 1 since the bis indexes start from 1 and not

CRA Git | Maintained and supported by SUSTech CRA and CCSE