mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: fix device connection issue if profile(UUIDs) info is delayed

Browse source 
Keep all types of devices, only emit device info if device has audio profiles.
Heuristically add profiles based on bluez actions so device can still be connected
even without initial UUIDs info from signal InterfaceAdded for org.bluez.Device1.

Fixes #1330
This commit is contained in:
Huang-Huang Bao 2021-06-20 23:00:37 +08:00 • committed by Wim Taymans
parent b44fdf5ebb
commit 3433f40cd9
5 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
spa/plugins/bluez5/backend-hsphfpd.c
View file

@ -1137,6 +1137,7 @@ static DBusHandlerResult hsphfpd_parse_endpoint_properties(struct impl *backend,
t->n_channels = 1;
t->channels[0] = SPA_AUDIO_CHANNEL_MONO;
spa_bt_device_add_profile(d, t->profile);
spa_bt_device_connect_profile(t->device, t->profile);
spa_log_debug(backend->log, NAME": Transport %s available for hsphfpd", endpoint->path);

1
spa/plugins/bluez5/backend-native.c
View file

@ -1450,6 +1450,7 @@ static DBusHandlerResult profile_new_connection(DBusConnection *conn, DBusMessag
spa_log_warn(backend->log, NAME": unknown device for path %s", path);
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
spa_bt_device_add_profile(d, profile);
dbus_message_iter_next(&it[0]);
dbus_message_iter_get_basic(&it[0], &fd);

1
spa/plugins/bluez5/backend-ofono.c
View file

@ -364,6 +364,7 @@ static DBusHandlerResult ofono_audio_card_found(struct impl *backend, char *path
spa_log_error(backend->log, NAME": Device doesn’t exist for %s", path);
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
spa_bt_device_add_profile(d, profile);
t = _transport_create(backend, path, d, profile, codec, (struct spa_callbacks *)&ofono_transport_impl);

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

@ -882,6 +882,30 @@ static int device_connected(struct spa_bt_monitor *monitor, struct spa_bt_device
return 0;
}
/*
* Add profile to device based on bluez actions
* (update property UUIDs, trigger profile handlers),
* in case UUIDs is empty on signal InterfaceAdded for
* org.bluez.Device1. And emit device info if there is
* at least 1 profile on device. This should be called
* before any device setting accessing.
*/
int spa_bt_device_add_profile(struct spa_bt_device *device, enum spa_bt_profile profile)
{
struct spa_bt_monitor *monitor = device->monitor;
if (profile && (device->profiles & profile) == 0) {
spa_log_info(monitor->log, "device %p: add new profile %08x", device, profile);
device->profiles |= profile;
}
if (!device->added && device->profiles)
return device_connected(monitor, device, BT_DEVICE_INIT);
return 0;
}
static int device_try_connect_profile(struct spa_bt_device *device,
const char *profile_uuid)
{
@ -2559,6 +2583,7 @@ static DBusHandlerResult endpoint_set_configuration(DBusConnection *conn,
transport->volumes[i].hw_volume_max = SPA_BT_VOLUME_A2DP_MAX;
}
transport->profile = profile;
transport->a2dp_codec = codec;
transport_update_props(transport, &it[1], NULL);
@ -2566,6 +2591,8 @@ static DBusHandlerResult endpoint_set_configuration(DBusConnection *conn,
spa_log_warn(monitor->log, "no device found for transport");
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
spa_bt_device_add_profile(transport->device, transport->profile);
if (is_new)
spa_list_append(&transport->device->transport_list, &transport->device_link);
@ -3165,15 +3192,10 @@ static void interface_added(struct spa_bt_monitor *monitor,
}
device_update_props(d, props_iter, NULL);
/* We only care about audio devices. */
if (d->profiles == 0) {
device_free(d);
return;
}
/* Trigger bluez device creation before bluez profile negotiation started so that
* profile connection handlers can receive per-device settings during profile negotiation. */
device_connected(monitor, d, BT_DEVICE_INIT);
spa_bt_device_add_profile(d, SPA_BT_PROFILE_NULL);
d->reconnect_state = BT_DEVICE_RECONNECT_INIT;
device_start_timer(d);
}
@ -3495,6 +3517,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
spa_log_debug(monitor->log, "Properties changed in device %s", path);
device_update_props(d, &it[1], NULL);
spa_bt_device_add_profile(d, SPA_BT_PROFILE_NULL);
}
else if (spa_streq(iface, BLUEZ_MEDIA_ENDPOINT_INTERFACE)) {
struct spa_bt_remote_endpoint *ep;

1
spa/plugins/bluez5/defs.h
View file

@ -441,6 +441,7 @@ struct a2dp_codec;
struct spa_bt_device *spa_bt_device_find(struct spa_bt_monitor *monitor, const char *path);
struct spa_bt_device *spa_bt_device_find_by_address(struct spa_bt_monitor *monitor, const char *remote_address, const char *local_address);
int spa_bt_device_add_profile(struct spa_bt_device *device, enum spa_bt_profile profile);
int spa_bt_device_connect_profile(struct spa_bt_device *device, enum spa_bt_profile profile);
int spa_bt_device_check_profiles(struct spa_bt_device *device, bool force);
int spa_bt_device_ensure_a2dp_codec(struct spa_bt_device *device, const struct a2dp_codec **codecs);