Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nrf fromtree] Patches for ISO datapath issue #1467

Merged
merged 2 commits into from
Jan 25, 2024
Merged

[nrf fromtree] Patches for ISO datapath issue #1467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
827bb38
[nrf fromtree] Bluetooth: BAP: Add support for transparent coding format
Thalley Jan 8, 2024
9fa7a11
[nrf fromtree] Bluetooth: BAP: Fix issue with setting invalid iso dat…
Thalley Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions include/zephyr/bluetooth/audio/audio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ enum bt_audio_metadata_type {
((struct bt_audio_codec_cfg){ \
/* Use HCI data path as default, can be overwritten by application */ \
.path_id = BT_ISO_DATA_PATH_HCI, \
.ctlr_transcode = false, \
.id = _id, \
.cid = _cid, \
.vid = _vid, \
Expand All @@ -231,6 +232,7 @@ enum bt_audio_metadata_type {
((struct bt_audio_codec_cap){ \
/* Use HCI data path as default, can be overwritten by application */ \
.path_id = BT_ISO_DATA_PATH_HCI, \
.ctlr_transcode = false, \
.id = (_id), \
.cid = (_cid), \
.vid = (_vid), \
Expand Down Expand Up @@ -316,6 +318,12 @@ struct bt_audio_codec_cap {
* vendor specific ID.
*/
uint8_t path_id;
/** Whether or not the local controller should transcode
*
* This effectively sets the coding format for the ISO data path to @ref
* BT_HCI_CODING_FORMAT_TRANSPARENT if false, else uses the @ref bt_audio_codec_cfg.id.
*/
bool ctlr_transcode;
/** Codec ID */
uint8_t id;
/** Codec Company ID */
Expand Down Expand Up @@ -344,6 +352,12 @@ struct bt_audio_codec_cfg {
* vendor specific ID.
*/
uint8_t path_id;
/** Whether or not the local controller should transcode
*
* This effectively sets the coding format for the ISO data path to @ref
* BT_HCI_CODING_FORMAT_TRANSPARENT if false, else uses the @ref bt_audio_codec_cfg.id.
*/
bool ctlr_transcode;
/** Codec ID */
uint8_t id;
/** Codec Company ID */
Expand Down
6 changes: 1 addition & 5 deletions subsys/bluetooth/audio/ascs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1820,11 +1820,7 @@ static int ase_stream_qos(struct bt_bap_stream *stream, struct bt_audio_codec_qo
* we have the ISO <-> EP coupling completed (due to setting
* the CIS ID in the QoS procedure).
*/
if (ep->dir == BT_AUDIO_DIR_SINK) {
bt_audio_codec_cfg_to_iso_path(&ep->iso->rx.path, stream->codec_cfg);
} else {
bt_audio_codec_cfg_to_iso_path(&ep->iso->tx.path, stream->codec_cfg);
}
bt_bap_iso_configure_data_path(ep, stream->codec_cfg);

ep->cig_id = cig_id;
ep->cis_id = cis_id;
Expand Down
2 changes: 1 addition & 1 deletion subsys/bluetooth/audio/bap_broadcast_sink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ static int bt_bap_broadcast_sink_setup_stream(struct bt_bap_broadcast_sink *sink
bt_bap_iso_bind_ep(iso, ep);

bt_audio_codec_qos_to_iso_qos(iso->chan.qos->rx, &sink->codec_qos);
bt_audio_codec_cfg_to_iso_path(iso->chan.qos->rx->path, codec_cfg);
bt_bap_iso_configure_data_path(ep, codec_cfg);

bt_bap_iso_unref(iso);

Expand Down
4 changes: 2 additions & 2 deletions subsys/bluetooth/audio/bap_broadcast_source.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ static int broadcast_source_setup_stream(uint8_t index, struct bt_bap_stream *st
bt_bap_iso_bind_ep(iso, ep);

bt_audio_codec_qos_to_iso_qos(iso->chan.qos->tx, qos);
bt_audio_codec_cfg_to_iso_path(iso->chan.qos->tx->path, codec_cfg);
bt_bap_iso_configure_data_path(ep, codec_cfg);
#if defined(CONFIG_BT_ISO_TEST_PARAMS)
iso->chan.qos->num_subevents = qos->num_subevents;
#endif /* CONFIG_BT_ISO_TEST_PARAMS */
Expand Down Expand Up @@ -878,7 +878,7 @@ int bt_bap_broadcast_source_reconfig(struct bt_bap_broadcast_source *source,

iso_qos = stream->ep->iso->chan.qos->tx;
bt_bap_stream_attach(NULL, stream, stream->ep, codec_cfg);
bt_audio_codec_cfg_to_iso_path(iso_qos->path, codec_cfg);
bt_bap_iso_configure_data_path(stream->ep, codec_cfg);
}
}

Expand Down
48 changes: 39 additions & 9 deletions subsys/bluetooth/audio/bap_iso.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,19 +129,12 @@ void bt_bap_iso_init(struct bt_bap_iso *iso, struct bt_iso_chan_ops *ops)
iso->chan.ops = ops;
iso->chan.qos = &iso->qos;

/* Setup points for both Tx and Rx
/* Setup the QoS for both Tx and Rx
* This is due to the limitation in the ISO API where pointers like
* the `qos->tx` shall be initialized before the CIS is connected if
* ever want to use it for TX, and ditto for RX. They cannot be
* initialized after the CIS has been connected
* the `qos->tx` shall be initialized before the CIS is created
*/
iso->chan.qos->rx = &iso->rx.qos;
iso->chan.qos->rx->path = &iso->rx.path;
iso->chan.qos->rx->path->cc = iso->rx.cc;

iso->chan.qos->tx = &iso->tx.qos;
iso->chan.qos->tx->path = &iso->tx.path;
iso->chan.qos->tx->path->cc = iso->tx.cc;
}

static struct bt_bap_iso_dir *bap_iso_get_iso_dir(bool unicast_client, struct bt_bap_iso *iso,
Expand All @@ -164,6 +157,43 @@ static struct bt_bap_iso_dir *bap_iso_get_iso_dir(bool unicast_client, struct bt
}
}

void bt_bap_iso_configure_data_path(struct bt_bap_ep *ep, struct bt_audio_codec_cfg *codec_cfg)
{
struct bt_bap_iso *bap_iso = ep->iso;
struct bt_iso_chan_qos *qos = bap_iso->chan.qos;
const bool is_unicast_client =
IS_ENABLED(CONFIG_BT_BAP_UNICAST_CLIENT) && bt_bap_ep_is_unicast_client(ep);
struct bt_bap_iso_dir *iso_dir = bap_iso_get_iso_dir(is_unicast_client, bap_iso, ep->dir);
struct bt_iso_chan_path *path = &iso_dir->path;

/* Setup the data path objects */
if (iso_dir == &bap_iso->rx) {
qos->rx->path = path;
} else {
qos->tx->path = path;
}

/* Configure the data path to either use the controller for transcoding, or set the path to
* be transparant to indicate that the transcoding happens somewhere else
*/
path->pid = codec_cfg->path_id;

if (codec_cfg->ctlr_transcode) {
path->format = codec_cfg->id;
path->cid = codec_cfg->cid;
path->vid = codec_cfg->vid;
path->delay = 0;
path->cc_len = codec_cfg->data_len;
path->cc = codec_cfg->data;
} else {
path->format = BT_HCI_CODING_FORMAT_TRANSPARENT;
path->cid = 0;
path->vid = 0;
path->delay = 0;
path->cc_len = 0;
path->cc = NULL;
}
}
static bool is_unicast_client_ep(struct bt_bap_ep *ep)
{
return IS_ENABLED(CONFIG_BT_BAP_UNICAST_CLIENT) && bt_bap_ep_is_unicast_client(ep);
Expand Down
1 change: 1 addition & 0 deletions subsys/bluetooth/audio/bap_iso.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ void bt_bap_iso_foreach(bt_bap_iso_func_t func, void *user_data);
struct bt_bap_iso *bt_bap_iso_find(bt_bap_iso_func_t func, void *user_data);
void bt_bap_iso_init(struct bt_bap_iso *iso, struct bt_iso_chan_ops *ops);
void bt_bap_iso_bind_ep(struct bt_bap_iso *iso, struct bt_bap_ep *ep);
void bt_bap_iso_configure_data_path(struct bt_bap_ep *ep, struct bt_audio_codec_cfg *codec_cfg);
void bt_bap_iso_unbind_ep(struct bt_bap_iso *iso, struct bt_bap_ep *ep);
struct bt_bap_ep *bt_bap_iso_get_ep(bool unicast_client, struct bt_bap_iso *iso,
enum bt_audio_dir dir);
Expand Down
12 changes: 0 additions & 12 deletions subsys/bluetooth/audio/bap_stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,6 @@

LOG_MODULE_REGISTER(bt_bap_stream, CONFIG_BT_BAP_STREAM_LOG_LEVEL);

void bt_audio_codec_cfg_to_iso_path(struct bt_iso_chan_path *path,
struct bt_audio_codec_cfg *codec_cfg)
{
path->pid = codec_cfg->path_id;
path->format = codec_cfg->id;
path->cid = codec_cfg->cid;
path->vid = codec_cfg->vid;
path->delay = 0; /* TODO: Add to bt_audio_codec_cfg? Use presentation delay? */
path->cc_len = codec_cfg->data_len;
path->cc = codec_cfg->data;
}

#if defined(CONFIG_BT_BAP_UNICAST_CLIENT) || defined(CONFIG_BT_BAP_BROADCAST_SOURCE) || \
defined(CONFIG_BT_BAP_BROADCAST_SINK)
void bt_audio_codec_qos_to_iso_qos(struct bt_iso_chan_io_qos *io,
Expand Down
2 changes: 0 additions & 2 deletions subsys/bluetooth/audio/bap_stream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ void bt_bap_stream_reset(struct bt_bap_stream *stream);
void bt_bap_stream_attach(struct bt_conn *conn, struct bt_bap_stream *stream, struct bt_bap_ep *ep,
struct bt_audio_codec_cfg *codec_cfg);

void bt_audio_codec_cfg_to_iso_path(struct bt_iso_chan_path *path,
struct bt_audio_codec_cfg *codec_cfg);
void bt_audio_codec_qos_to_iso_qos(struct bt_iso_chan_io_qos *io,
const struct bt_audio_codec_qos *codec_qos);

Expand Down
13 changes: 2 additions & 11 deletions subsys/bluetooth/audio/bap_unicast_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,17 +774,8 @@ static void unicast_client_ep_qos_state(struct bt_bap_ep *ep, struct net_buf_sim
* we have the ISO <-> EP coupling completed (due to setting
* the CIS ID in the QoS procedure).
*/
if (ep->dir == BT_AUDIO_DIR_SOURCE) {
/* If the endpoint is a source, then we need to
* configure our RX parameters
*/
bt_audio_codec_cfg_to_iso_path(&ep->iso->rx.path, stream->codec_cfg);
} else {
/* If the endpoint is a sink, then we need to
* configure our TX parameters
*/
bt_audio_codec_cfg_to_iso_path(&ep->iso->tx.path, stream->codec_cfg);
}

bt_bap_iso_configure_data_path(ep, stream->codec_cfg);
}

/* Notify upper layer */
Expand Down