Skip to content

Commit 71b1591

Browse files
Thalleycarlescufi
Thalley
authored and
carlescufi
committed
Bluetooth: CAP: Remove qos from start_stream_param
Remove the qos field from bt_cap_unicast_audio_start_stream_param as it was not used. The QOS values are set when creating the unicast group, and not when starting the streams. Signed-off-by: Emil Gydesen <[email protected]>
1 parent 3926134 commit 71b1591

File tree

5 files changed

+2
-42
lines changed

5 files changed

+2
-42
lines changed

‎include/zephyr/bluetooth/audio/cap.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,6 @@ struct bt_cap_unicast_audio_start_stream_param {
221221
* stream context (@ref BT_AUDIO_METADATA_TYPE_STREAM_CONTEXT) bitfield.
222222
*/
223223
struct bt_audio_codec_cfg *codec_cfg;
224-
225-
/** Quality of Service configuration. */
226-
struct bt_audio_codec_qos *qos;
227224
};
228225

229226
struct bt_cap_unicast_audio_start_param {

‎samples/bluetooth/tmap_central/src/cap_initiator.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,6 @@ static int unicast_audio_start(struct bt_conn *conn, struct bt_bap_unicast_group
344344
stream_param.stream = &unicast_streams[0];
345345
stream_param.ep = unicast_sink_eps[0];
346346
stream_param.codec_cfg = &unicast_preset_48_2_1.codec_cfg;
347-
stream_param.qos = &unicast_preset_48_2_1.qos;
348347

349348
err = bt_cap_initiator_unicast_audio_start(&param, unicast_group);
350349
if (err != 0) {

‎subsys/bluetooth/audio/cap_initiator.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -676,11 +676,6 @@ static bool valid_unicast_audio_start_param(const struct bt_cap_unicast_audio_st
676676
return false;
677677
}
678678

679-
CHECKIF(stream_param->qos == NULL) {
680-
LOG_DBG("param->stream_params[%zu].qos is NULL", i);
681-
return false;
682-
}
683-
684679
CHECKIF(member == NULL) {
685680
LOG_DBG("param->stream_params[%zu].member is NULL", i);
686681
return false;

‎subsys/bluetooth/audio/shell/cap_initiator.c

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,8 @@ static int cmd_cap_initiator_unicast_start(const struct shell *sh, size_t argc,
252252
stream_param[start_param.count].stream = stream;
253253
stream_param[start_param.count].ep = snk_ep;
254254
copy_unicast_stream_preset(uni_stream, default_sink_preset);
255-
stream_param[start_param.count].codec_cfg = &uni_stream->codec_cfg;
256-
stream_param[start_param.count].qos = &uni_stream->qos;
255+
stream_param[start_param.count].codec_cfg = &uni_stream->codec_cfg;
257256

258-
group_stream_params[start_param.count].qos =
259-
stream_param[start_param.count].qos;
260257
group_stream_params[start_param.count].stream =
261258
&stream_param[start_param.count].stream->bap_stream;
262259
pair_params[pair_cnt + j].tx_param =
@@ -286,11 +283,7 @@ static int cmd_cap_initiator_unicast_start(const struct shell *sh, size_t argc,
286283
stream_param[start_param.count].stream = stream;
287284
stream_param[start_param.count].ep = src_ep;
288285
copy_unicast_stream_preset(uni_stream, default_source_preset);
289-
stream_param[start_param.count].codec_cfg = &uni_stream->codec_cfg;
290-
stream_param[start_param.count].qos = &uni_stream->qos;
291-
292-
group_stream_params[start_param.count].qos =
293-
stream_param[start_param.count].qos;
286+
stream_param[start_param.count].codec_cfg = &uni_stream->codec_cfg;
294287
group_stream_params[start_param.count].stream =
295288
&stream_param[start_param.count].stream->bap_stream;
296289
pair_params[pair_cnt + j].rx_param =
@@ -501,8 +494,6 @@ static int cap_ac_unicast_start(const struct bap_unicast_ac_param *param,
501494
struct bt_audio_codec_cfg *src_codec_cfgs[BAP_UNICAST_AC_MAX_SRC] = {0};
502495
struct bt_cap_stream *snk_cap_streams[BAP_UNICAST_AC_MAX_SNK] = {0};
503496
struct bt_cap_stream *src_cap_streams[BAP_UNICAST_AC_MAX_SRC] = {0};
504-
struct bt_audio_codec_qos *snk_qos[BAP_UNICAST_AC_MAX_SNK] = {0};
505-
struct bt_audio_codec_qos *src_qos[BAP_UNICAST_AC_MAX_SRC] = {0};
506497
struct bt_cap_unicast_audio_start_param start_param = {0};
507498
struct bt_bap_ep *snk_eps[BAP_UNICAST_AC_MAX_SNK] = {0};
508499
struct bt_bap_ep *src_eps[BAP_UNICAST_AC_MAX_SRC] = {0};
@@ -559,13 +550,11 @@ static int cap_ac_unicast_start(const struct bap_unicast_ac_param *param,
559550
*/
560551
for (size_t i = 0U; i < snk_cnt; i++) {
561552
snk_cap_streams[i] = &snk_uni_streams[i]->stream;
562-
snk_qos[i] = &snk_uni_streams[i]->qos;
563553
snk_codec_cfgs[i] = &snk_uni_streams[i]->codec_cfg;
564554
}
565555

566556
for (size_t i = 0U; i < src_cnt; i++) {
567557
src_cap_streams[i] = &src_uni_streams[i]->stream;
568-
src_qos[i] = &src_uni_streams[i]->qos;
569558
src_codec_cfgs[i] = &src_uni_streams[i]->codec_cfg;
570559
}
571560

@@ -578,7 +567,6 @@ static int cap_ac_unicast_start(const struct bap_unicast_ac_param *param,
578567
stream_param->member.member = connected_conns[i];
579568
stream_param->codec_cfg = snk_codec_cfgs[snk_stream_cnt];
580569
stream_param->ep = snk_eps[snk_stream_cnt];
581-
stream_param->qos = snk_qos[snk_stream_cnt];
582570
stream_param->stream = snk_cap_streams[snk_stream_cnt];
583571

584572
snk_stream_cnt++;
@@ -606,7 +594,6 @@ static int cap_ac_unicast_start(const struct bap_unicast_ac_param *param,
606594
stream_param->member.member = connected_conns[i];
607595
stream_param->codec_cfg = src_codec_cfgs[src_stream_cnt];
608596
stream_param->ep = src_eps[src_stream_cnt];
609-
stream_param->qos = src_qos[src_stream_cnt];
610597
stream_param->stream = src_cap_streams[src_stream_cnt];
611598

612599
src_stream_cnt++;

‎tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@ static void unicast_audio_start_inval(struct bt_bap_unicast_group *unicast_group
545545
valid_stream_param.stream = &unicast_client_streams[0];
546546
valid_stream_param.ep = unicast_sink_eps[bt_conn_index(default_conn)][0];
547547
valid_stream_param.codec_cfg = &unicast_preset_16_2_1.codec_cfg;
548-
valid_stream_param.qos = &unicast_preset_16_2_1.qos;
549548

550549
/* Test NULL parameters */
551550
err = bt_cap_initiator_unicast_audio_start(NULL, unicast_group);
@@ -625,16 +624,6 @@ static void unicast_audio_start_inval(struct bt_bap_unicast_group *unicast_group
625624
return;
626625
}
627626

628-
memcpy(&invalid_stream_param, &valid_stream_param, sizeof(valid_stream_param));
629-
630-
invalid_stream_param.qos = NULL;
631-
err = bt_cap_initiator_unicast_audio_start(&invalid_start_param, unicast_group);
632-
if (err == 0) {
633-
FAIL("bt_cap_initiator_unicast_audio_start with NULL stream params qos did not "
634-
"fail\n");
635-
return;
636-
}
637-
638627
/* Clear metadata so that it does not contain the mandatory stream context */
639628
memcpy(&invalid_stream_param, &valid_stream_param, sizeof(valid_stream_param));
640629
memset(&invalid_codec.meta, 0, sizeof(invalid_codec.meta));
@@ -661,7 +650,6 @@ static void unicast_audio_start(struct bt_bap_unicast_group *unicast_group, bool
661650
stream_param[0].stream = &unicast_client_streams[0];
662651
stream_param[0].ep = unicast_sink_eps[bt_conn_index(default_conn)][0];
663652
stream_param[0].codec_cfg = &unicast_preset_16_2_1.codec_cfg;
664-
stream_param[0].qos = &unicast_preset_16_2_1.qos;
665653

666654
UNSET_FLAG(flag_started);
667655

@@ -1040,8 +1028,6 @@ static int cap_initiator_ac_cap_unicast_start(const struct cap_initiator_ac_para
10401028
struct bt_cap_stream *snk_cap_streams[CAP_AC_MAX_SNK] = {0};
10411029
struct bt_cap_stream *src_cap_streams[CAP_AC_MAX_SRC] = {0};
10421030
struct bt_cap_unicast_audio_start_param start_param = {0};
1043-
struct bt_audio_codec_qos *snk_qos[CAP_AC_MAX_SNK] = {0};
1044-
struct bt_audio_codec_qos *src_qos[CAP_AC_MAX_SRC] = {0};
10451031
struct bt_bap_ep *snk_eps[CAP_AC_MAX_SNK] = {0};
10461032
struct bt_bap_ep *src_eps[CAP_AC_MAX_SRC] = {0};
10471033
size_t snk_stream_cnt = 0U;
@@ -1095,13 +1081,11 @@ static int cap_initiator_ac_cap_unicast_start(const struct cap_initiator_ac_para
10951081
*/
10961082
for (size_t i = 0U; i < snk_cnt; i++) {
10971083
snk_cap_streams[i] = &snk_uni_streams[i]->stream;
1098-
snk_qos[i] = &snk_uni_streams[i]->qos;
10991084
snk_codec_cfgs[i] = &snk_uni_streams[i]->codec_cfg;
11001085
}
11011086

11021087
for (size_t i = 0U; i < src_cnt; i++) {
11031088
src_cap_streams[i] = &src_uni_streams[i]->stream;
1104-
src_qos[i] = &src_uni_streams[i]->qos;
11051089
src_codec_cfgs[i] = &src_uni_streams[i]->codec_cfg;
11061090
}
11071091

@@ -1114,7 +1098,6 @@ static int cap_initiator_ac_cap_unicast_start(const struct cap_initiator_ac_para
11141098
stream_param->member.member = connected_conns[i];
11151099
stream_param->codec_cfg = snk_codec_cfgs[snk_stream_cnt];
11161100
stream_param->ep = snk_eps[snk_stream_cnt];
1117-
stream_param->qos = snk_qos[snk_stream_cnt];
11181101
stream_param->stream = snk_cap_streams[snk_stream_cnt];
11191102

11201103
snk_stream_cnt++;
@@ -1132,7 +1115,6 @@ static int cap_initiator_ac_cap_unicast_start(const struct cap_initiator_ac_para
11321115
stream_param->member.member = connected_conns[i];
11331116
stream_param->codec_cfg = src_codec_cfgs[src_stream_cnt];
11341117
stream_param->ep = src_eps[src_stream_cnt];
1135-
stream_param->qos = src_qos[src_stream_cnt];
11361118
stream_param->stream = src_cap_streams[src_stream_cnt];
11371119

11381120
src_stream_cnt++;

0 commit comments

Comments
 (0)