mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for the broadcast source multiple BIS implementation in BlueZ.

Browse source
This commit is contained in:
Silviu Florian Barbulescu 2024-02-29 17:18:31 +02:00 • committed by Wim Taymans
parent ffb0eff708
commit ab87eba149
1 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

55
spa/plugins/bluez5/bluez5-dbus.c
View file

@ -2612,21 +2612,22 @@ static struct spa_bt_remote_endpoint *remote_endpoint_find(struct spa_bt_monitor
return NULL; return NULL;
} }
static struct spa_bt_device *create_bcast_device(struct spa_bt_monitor *monitor, const char *object_path) static struct spa_bt_device *create_bcast_device(struct spa_bt_monitor *monitor, const char *adapter_path,
const char *transport_path)
{ {
struct spa_bt_device *d; struct spa_bt_device *d;
struct spa_bt_adapter *adapter; struct spa_bt_adapter *adapter;
adapter = adapter_find(monitor, object_path); adapter = adapter_find(monitor, adapter_path);
if (adapter == NULL) { if (adapter == NULL) {
spa_log_warn(monitor->log, "unknown adapter %s", object_path); spa_log_warn(monitor->log, "unknown adapter %s", adapter_path);
return NULL; return NULL;
} }
d = device_create(monitor, object_path); d = device_create(monitor, transport_path);
if (d == NULL) { if (d == NULL) {
spa_log_warn(monitor->log, "can't create Bluetooth device %s: %m", spa_log_warn(monitor->log, "can't create Bluetooth device %s: %m",
object_path); transport_path);
return NULL; return NULL;
} }
@ -2634,7 +2635,8 @@ static struct spa_bt_device *create_bcast_device(struct spa_bt_monitor *monitor,
d->adapter_path = strdup(adapter->path); d->adapter_path = strdup(adapter->path);
d->alias = strdup(adapter->alias); d->alias = strdup(adapter->alias);
d->name = strdup(adapter->name); d->name = strdup(adapter->name);
d->address = strdup("00:00:00:00:00:00"); if (asprintf(&d->address , "00:00:00:00:00:00.%d",d->id) < 0)
return NULL;
d->reconnect_state = BT_DEVICE_RECONNECT_STOP; d->reconnect_state = BT_DEVICE_RECONNECT_STOP;
device_update_hw_volume_profiles(d); device_update_hw_volume_profiles(d);
@ -2672,28 +2674,19 @@ static int remote_endpoint_update_props(struct spa_bt_remote_endpoint *remote_en
if (spa_streq(key, "UUID")) { if (spa_streq(key, "UUID")) {
free(remote_endpoint->uuid); free(remote_endpoint->uuid);
remote_endpoint->uuid = strdup(value); remote_endpoint->uuid = strdup(value);
if(spa_streq(remote_endpoint->uuid, SPA_BT_UUID_BAP_BROADCAST_SINK))
/* Set remote endpoint as an acceptor for a broadcast sink.
* So the transport is an initiator.
*/
remote_endpoint->acceptor = true;
} }
else if (spa_streq(key, "Device")) { else if (spa_streq(key, "Device")) {
struct spa_bt_device *device; struct spa_bt_device *device;
device = spa_bt_device_find(monitor, value); device = spa_bt_device_find(monitor, value);
if (device == NULL) { if (device == NULL) {
/* goto next;
* If a broadcast sink endpoint is detected (over DBus) a new device
* will be created. This device will be our simulated remote device.
* This is done because BlueZ sets the adapter as the device
* that is connected to for a broadcast sink endpoint/transport.
*/
if (spa_streq(remote_endpoint->uuid, SPA_BT_UUID_BAP_BROADCAST_SINK)) {
device = create_bcast_device(monitor, value);
if (device == NULL)
goto next;
remote_endpoint->acceptor = true;
device_set_connected(device, 1);
} else {
goto next;
}
} }
spa_log_debug(monitor->log, "remote_endpoint %p: device -> %p", remote_endpoint, device); spa_log_debug(monitor->log, "remote_endpoint %p: device -> %p", remote_endpoint, device);
@ -3306,6 +3299,24 @@ static int transport_update_props(struct spa_bt_transport *transport,
} }
else if (spa_streq(key, "Device")) { else if (spa_streq(key, "Device")) {
struct spa_bt_device *device = spa_bt_device_find(monitor, value); struct spa_bt_device *device = spa_bt_device_find(monitor, value);
if ((device == NULL) &&
(transport->profile == SPA_BT_PROFILE_BAP_BROADCAST_SINK)) {
/*
* If a transport with profile broadcast source is detected (over DBus)
* and no device is found for it, a new device will be created.
* This device will be our simulated remote device.
* This is done because BlueZ sets the adapter as the device
* that is connected to a broadcast sink endpoint/transport.
*/
device = spa_bt_device_find(monitor, transport->path);
if (device == NULL) {
device = create_bcast_device(monitor, value, transport->path);
if (device == NULL) {
spa_log_warn(monitor->log, "could not find device %s", value);
} else
device_set_connected(device, 1);
}
}
if (transport->device != device) { if (transport->device != device) {
if (transport->device != NULL) if (transport->device != NULL)
spa_list_remove(&transport->device_link); spa_list_remove(&transport->device_link);