system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-06-29 05:54:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

bluez5: bap: Use a string instead of int array to set Broadcast code

Browse Source 
Currently, the user sets the Broadcast Code via an array of integers
in the config file. However, the Bluetooth Core Specification indicates
that it should be set via a 16 byte string. This commit replaces the old
implementation with the one required by the spec.

Tested the commit with the example provided in the Core Spec:
Broadcast Code: Børne House
Result from btsnoop log:
< HCI Command: LE Create Broadcast Isochronous Group (0x08|0x0068) plen 31
...
Broadcast Code[16]: 000000006573756f4820656e72b8c342

The result matches the example given in the spec.
This commit is contained in:
Vlad Pruteanu 2024-06-10 15:41:57 +03:00
parent b7af52e3fb
commit 1466d0ae78
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/dox/config/pipewire-devices.7.md
View File

@ -429,7 +429,7 @@ Example:
```
bluez5.bcast_source.config = [
{
"broadcast_code": [ 1, 2, 104, 5, 83, 241, 65, 90, 162, 101, 187, 175, 198, 234, 3, 184 ],
"broadcast_code": "Børne House",
"encryption: false,
"bis": [
{ # BIS configuration

24
spa/plugins/bluez5/bluez5-dbus.c
View File

@ -175,7 +175,7 @@ struct spa_bt_bis {
struct spa_bt_big {
struct spa_list link;
int broadcast_code[BROADCAST_CODE_LEN];
char broadcast_code[BROADCAST_CODE_LEN];
bool encryption;
int presentation_delay;
struct spa_list bis_list;
@ -6171,13 +6171,23 @@ static void parse_broadcast_source_config(struct spa_bt_monitor *monitor, const
/* Iterate on all BIG values */
while (spa_json_get_string(&it[1], key, sizeof(key)) > 0) {
if (spa_streq(key, "broadcast_code")) {
if (spa_json_enter_array(&it[1], &it_array[1]) <= 0)
goto parse_failed;
for (cursor = 0; cursor < BROADCAST_CODE_LEN; cursor++) {
if (spa_json_get_int(&it_array[1], &big_entry->broadcast_code[cursor]) <= 0)
/* Len is BROADCAST_CODE_LEN plus 2 (for the quotes, as they count towards the string length
* even if they don't appear in the final big_entry->broadcast_code string) plus 1 for the
* null string terminator.
*/
if (spa_json_get_string(&it[1], big_entry->broadcast_code,BROADCAST_CODE_LEN + 2 + 1) <= 0)
goto parse_failed;
spa_log_debug(monitor->log, "big_entry->broadcast_code[%d] %d", cursor, big_entry->broadcast_code[cursor]);
}
/* BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 3, Part C
* 3.2.6.3 Representation
*
* The transformation from string to number shall be by
* representing the string in UTF-8, placing the resulting bytes in 8-bit fields of the
* value starting at the least significant bit, and then padding with zeros in the
* most significant bits if necessary.
*/
for (int i = 0; i <= BROADCAST_CODE_LEN/2 - 1; i++)
SPA_SWAP(big_entry->broadcast_code[i], big_entry->broadcast_code[BROADCAST_CODE_LEN - 1 -i]);
spa_log_debug(monitor->log, "big_entry->broadcast_code %s", big_entry->broadcast_code);
} else if (spa_streq(key, "encryption")) {
if (spa_json_get_bool(&it[1], &big_entry->encryption) <= 0)
goto parse_failed;