| Message ID | 20241115103825.19761-2-iulia.tanasescu@nxp.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | bass: Rework Scan Delegator | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/BuildEll | success | Build ELL PASS |
| tedd_an/BluezMake | success | Bluez Make PASS |
| tedd_an/MakeCheck | success | Bluez Make Check PASS |
| tedd_an/MakeDistcheck | success | Make Distcheck PASS |
| tedd_an/CheckValgrind | success | Check Valgrind PASS |
| tedd_an/CheckSmatch | success | CheckSparse PASS |
| tedd_an/bluezmakeextell | success | Make External ELL PASS |
| tedd_an/ScanBuild | success | Scan Build PASS |
This is automated email and please do not reply to this email! Dear submitter, Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series: PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=909927 ---Test result--- Test Summary: CheckPatch PENDING 0.20 seconds GitLint PENDING 0.23 seconds BuildEll PASS 20.94 seconds BluezMake PASS 1609.42 seconds MakeCheck PASS 13.61 seconds MakeDistcheck PASS 163.07 seconds CheckValgrind PASS 215.70 seconds CheckSmatch PASS 280.57 seconds bluezmakeextell PASS 100.12 seconds IncrementalBuild PENDING 0.26 seconds ScanBuild PASS 846.73 seconds Details ############################## Test: CheckPatch - PENDING Desc: Run checkpatch.pl script Output: ############################## Test: GitLint - PENDING Desc: Run gitlint Output: ############################## Test: IncrementalBuild - PENDING Desc: Incremental build with the patches in the series Output: --- Regards, Linux Bluetooth
Hi Iulia, On Fri, Nov 15, 2024 at 5:38 AM Iulia Tanasescu <iulia.tanasescu@nxp.com> wrote: > > This makes BAP parse_base public, so other plugins can reuse the logic > (BASS should also parse BASE internally for the Scan Delegator > implementation). For this sort of dependency should be handled by shared libraries, otherwise we create interdependencies of plugins. > Since different plugins need to handle BISes differently, this commit > also reworks parse_base to receive a BIS handler callback which will be > called for each parsed BIS. The idea itself is good though, but I suggest we put this under shared/bap.h, also it would be great to create some unit tests for it, perhaps one test per supported AC or something like that, anyway this can be added later on a separate set. > --- > profiles/audio/bap.c | 78 +++++++++++++++++++++++--------------------- > profiles/audio/bap.h | 8 +++++ > 2 files changed, 48 insertions(+), 38 deletions(-) > > diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c > index df685c6d3..98b28f15a 100644 > --- a/profiles/audio/bap.c > +++ b/profiles/audio/bap.c > @@ -1086,8 +1086,42 @@ static void create_stream_for_bis(struct bap_data *bap_data, > NULL, NULL); > } > > -static bool parse_base(struct bap_data *bap_data, struct bt_iso_base *base, > - struct bt_iso_qos *qos, util_debug_func_t func) > +static void bis_handler(uint8_t bis, uint8_t sgrp, struct iovec *caps, > + struct iovec *meta, struct bt_iso_qos *qos, void *user_data) > +{ > + struct bap_data *data = user_data; > + struct bt_bap_pac *lpac; > + char *path; > + > + bass_add_stream(data->device, meta, caps, qos, sgrp, bis); > + > + if (!bass_check_bis(data->device, bis)) > + /* If this Broadcast Sink is acting as a Scan > + * Delegator, only attempt to create streams > + * for the BISes required by the peer Broadcast > + * Assistant. > + */ > + return; > + > + /* Check if this BIS matches any local PAC */ > + bt_bap_verify_bis(data->bap, bis, > + caps, &lpac); > + > + if (!lpac) > + return; > + > + if (asprintf(&path, "%s/bis%d", > + device_get_path(data->device), > + bis) < 0) > + return; > + > + create_stream_for_bis(data, lpac, qos, > + caps, meta, path); > +} > + > +bool parse_base(struct bt_iso_base *base, struct bt_iso_qos *qos, > + util_debug_func_t func, bap_stream_cb_t handler, > + void *user_data) > { > struct iovec iov = { > .iov_base = base->base, > @@ -1167,9 +1201,6 @@ static bool parse_base(struct bap_data *bap_data, struct bt_iso_base *base, > uint8_t bis_index; > struct iovec *l3_caps; > struct iovec *merged_caps; > - struct bt_bap_pac *matched_lpac; > - char *path; > - int err; > > if (!util_iov_pull_u8(&iov, &bis_index)) { > ret = false; > @@ -1177,18 +1208,12 @@ static bool parse_base(struct bap_data *bap_data, struct bt_iso_base *base, > } > > util_debug(func, NULL, "BIS #%d", bis_index); > - err = asprintf(&path, "%s/bis%d", > - device_get_path(bap_data->device), > - bis_index); > - if (err < 0) > - continue; > > /* Read Codec Specific Configuration */ > l3_caps = new0(struct iovec, 1); > if (!util_iov_pull_u8(&iov, > (void *)&l3_caps->iov_len)) { > free(l3_caps); > - free(path); > ret = false; > goto group_fail; > } > @@ -1206,34 +1231,11 @@ static bool parse_base(struct bap_data *bap_data, struct bt_iso_base *base, > func); > > merged_caps = bt_bap_merge_caps(l2_caps, l3_caps); > - if (!merged_caps) { > - free(path); > + if (!merged_caps) > continue; > - } > - > - bass_add_stream(bap_data->device, meta, merged_caps, > - qos, idx, bis_index); > - > - if (!bass_check_bis(bap_data->device, bis_index)) { > - /* If this Broadcast Sink is acting as a Scan > - * Delegator, only attempt to create streams > - * for the BISes required by the peer Broadcast > - * Assistant. > - */ > - continue; > - } > - > - /* Check if this BIS matches any local PAC */ > - bt_bap_verify_bis(bap_data->bap, bis_index, > - merged_caps, &matched_lpac); > - > - if (matched_lpac == NULL) { > - free(path); > - continue; > - } > > - create_stream_for_bis(bap_data, matched_lpac, qos, > - merged_caps, meta, path); > + handler(bis_index, idx, merged_caps, meta, > + qos, user_data); > } > > group_fail: > @@ -1299,7 +1301,7 @@ static gboolean big_info_report_cb(GIOChannel *io, GIOCondition cond, > /* Analyze received BASE data and create remote media endpoints for each > * BIS matching our capabilities > */ > - parse_base(data, &base, &qos, bap_debug); > + parse_base(&base, &qos, bap_debug, bis_handler, data); > > service_set_connecting(req->data.service); > > diff --git a/profiles/audio/bap.h b/profiles/audio/bap.h > index cfe633311..cf2593db8 100644 > --- a/profiles/audio/bap.h > +++ b/profiles/audio/bap.h > @@ -7,5 +7,13 @@ > * > */ > > +typedef void (*bap_stream_cb_t)(uint8_t bis, uint8_t sgrp, > + struct iovec *caps, struct iovec *meta, > + struct bt_iso_qos *qos, void *user_data); > + > struct bt_bap *bap_get_session(struct btd_device *device); > void bap_scan_delegator_probe(struct btd_device *device); > + > +bool parse_base(struct bt_iso_base *base, struct bt_iso_qos *qos, > + util_debug_func_t func, bap_stream_cb_t handler, > + void *user_data); > -- > 2.43.0 >
diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index df685c6d3..98b28f15a 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -1086,8 +1086,42 @@ static void create_stream_for_bis(struct bap_data *bap_data, NULL, NULL); } -static bool parse_base(struct bap_data *bap_data, struct bt_iso_base *base, - struct bt_iso_qos *qos, util_debug_func_t func) +static void bis_handler(uint8_t bis, uint8_t sgrp, struct iovec *caps, + struct iovec *meta, struct bt_iso_qos *qos, void *user_data) +{ + struct bap_data *data = user_data; + struct bt_bap_pac *lpac; + char *path; + + bass_add_stream(data->device, meta, caps, qos, sgrp, bis); + + if (!bass_check_bis(data->device, bis)) + /* If this Broadcast Sink is acting as a Scan + * Delegator, only attempt to create streams + * for the BISes required by the peer Broadcast + * Assistant. + */ + return; + + /* Check if this BIS matches any local PAC */ + bt_bap_verify_bis(data->bap, bis, + caps, &lpac); + + if (!lpac) + return; + + if (asprintf(&path, "%s/bis%d", + device_get_path(data->device), + bis) < 0) + return; + + create_stream_for_bis(data, lpac, qos, + caps, meta, path); +} + +bool parse_base(struct bt_iso_base *base, struct bt_iso_qos *qos, + util_debug_func_t func, bap_stream_cb_t handler, + void *user_data) { struct iovec iov = { .iov_base = base->base, @@ -1167,9 +1201,6 @@ static bool parse_base(struct bap_data *bap_data, struct bt_iso_base *base, uint8_t bis_index; struct iovec *l3_caps; struct iovec *merged_caps; - struct bt_bap_pac *matched_lpac; - char *path; - int err; if (!util_iov_pull_u8(&iov, &bis_index)) { ret = false; @@ -1177,18 +1208,12 @@ static bool parse_base(struct bap_data *bap_data, struct bt_iso_base *base, } util_debug(func, NULL, "BIS #%d", bis_index); - err = asprintf(&path, "%s/bis%d", - device_get_path(bap_data->device), - bis_index); - if (err < 0) - continue; /* Read Codec Specific Configuration */ l3_caps = new0(struct iovec, 1); if (!util_iov_pull_u8(&iov, (void *)&l3_caps->iov_len)) { free(l3_caps); - free(path); ret = false; goto group_fail; } @@ -1206,34 +1231,11 @@ static bool parse_base(struct bap_data *bap_data, struct bt_iso_base *base, func); merged_caps = bt_bap_merge_caps(l2_caps, l3_caps); - if (!merged_caps) { - free(path); + if (!merged_caps) continue; - } - - bass_add_stream(bap_data->device, meta, merged_caps, - qos, idx, bis_index); - - if (!bass_check_bis(bap_data->device, bis_index)) { - /* If this Broadcast Sink is acting as a Scan - * Delegator, only attempt to create streams - * for the BISes required by the peer Broadcast - * Assistant. - */ - continue; - } - - /* Check if this BIS matches any local PAC */ - bt_bap_verify_bis(bap_data->bap, bis_index, - merged_caps, &matched_lpac); - - if (matched_lpac == NULL) { - free(path); - continue; - } - create_stream_for_bis(bap_data, matched_lpac, qos, - merged_caps, meta, path); + handler(bis_index, idx, merged_caps, meta, + qos, user_data); } group_fail: @@ -1299,7 +1301,7 @@ static gboolean big_info_report_cb(GIOChannel *io, GIOCondition cond, /* Analyze received BASE data and create remote media endpoints for each * BIS matching our capabilities */ - parse_base(data, &base, &qos, bap_debug); + parse_base(&base, &qos, bap_debug, bis_handler, data); service_set_connecting(req->data.service); diff --git a/profiles/audio/bap.h b/profiles/audio/bap.h index cfe633311..cf2593db8 100644 --- a/profiles/audio/bap.h +++ b/profiles/audio/bap.h @@ -7,5 +7,13 @@ * */ +typedef void (*bap_stream_cb_t)(uint8_t bis, uint8_t sgrp, + struct iovec *caps, struct iovec *meta, + struct bt_iso_qos *qos, void *user_data); + struct bt_bap *bap_get_session(struct btd_device *device); void bap_scan_delegator_probe(struct btd_device *device); + +bool parse_base(struct bt_iso_base *base, struct bt_iso_qos *qos, + util_debug_func_t func, bap_stream_cb_t handler, + void *user_data);