michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: BAP: Fix broadcast source reconfig with subset of streams

Browse source 
When the bt_bap_broadcast_source_reconfig was supplied with a subset
of the streams, it would only update the codec cfg and qos for the
streams provided in the parameters.

This commit changes that, so all streams are properly updated,
as they share some common values.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2023-10-05 14:14:04 +02:00 • committed by Johan Hedberg
commit de67ec9e67
1 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

35
subsys/bluetooth/audio/bap_broadcast_source.c
View file

@ -821,6 +821,7 @@ int bt_bap_broadcast_source_reconfig(struct bt_bap_broadcast_source *source,
for (size_t i = 0U; i < param->params_count; i++) {
const struct bt_bap_broadcast_source_subgroup_param *subgroup_param;
struct bt_audio_codec_cfg *codec_cfg;
struct bt_bap_stream *stream;
if (i == 0) {
subgroup =
@ -837,8 +838,6 @@ int bt_bap_broadcast_source_reconfig(struct bt_bap_broadcast_source *source,
const struct bt_bap_broadcast_source_stream_param *stream_param;
struct bt_audio_broadcast_stream_data *stream_data;
struct bt_bap_stream *subgroup_stream;
struct bt_iso_chan_io_qos *iso_qos;
struct bt_bap_stream *stream;
size_t stream_idx;
stream_param = &subgroup_param->params[j];
@ -853,14 +852,6 @@ int bt_bap_broadcast_source_reconfig(struct bt_bap_broadcast_source *source,
stream_idx++;
}
iso_qos = stream->ep->iso->chan.qos->tx;
bt_bap_stream_attach(NULL, stream, stream->ep, codec_cfg);
bt_audio_codec_qos_to_iso_qos(iso_qos, qos);
bt_audio_codec_cfg_to_iso_path(iso_qos->path, codec_cfg);
stream->qos = qos;
/* Store the BIS specific codec configuration data in the broadcast source.
* It is stored in the broadcast* source, instead of the stream object,
* as this is only relevant for the broadcast source, and not used
@ -870,6 +861,30 @@ int bt_bap_broadcast_source_reconfig(struct bt_bap_broadcast_source *source,
(void)memcpy(stream_data->data, stream_param->data, stream_param->data_len);
stream_data->data_len = stream_param->data_len;
}
/* Apply the codec_cfg to all streams in the subgroup, and not just the ones in the
* params
*/
SYS_SLIST_FOR_EACH_CONTAINER(&subgroup->streams, stream, _node) {
struct bt_iso_chan_io_qos *iso_qos;
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);
}
}
/* Finally we apply the new qos and to all streams */
SYS_SLIST_FOR_EACH_CONTAINER(&source->subgroups, subgroup, _node) {
struct bt_bap_stream *stream;
SYS_SLIST_FOR_EACH_CONTAINER(&subgroup->streams, stream, _node) {
struct bt_iso_chan_io_qos *iso_qos;
iso_qos = stream->ep->iso->chan.qos->tx;
bt_audio_codec_qos_to_iso_qos(iso_qos, qos);
stream->qos = qos;
}
}
source->qos = qos;