mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: probe adapter msbc capability via hci commands

Browse source 
Using a probe connection to determine adapter msbc capability causes
problems on some adapters (ff8c3d2, 84bc0490a5, 717004334b,
pipewire#2030) and seems to be a bad idea.

Go back to probing for transparent msbc transport capability via HCI
commands. bluetooth/hci.h may be deprecated later, but for now it's
better to go back to using it.  (In practice, adapters not supporting
esco appear to be fairly rare; kernel commit in 2013 refers to "older
devices", so if we can't use HCI, assume the adapter supports the
necessary modes.)
This commit is contained in:
Pauli Virtanen 2022-01-20 22:39:51 +02:00
parent 483831e514
commit 1da23145df
4 changed files with 120 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -550,11 +550,10 @@ fail:
#ifdef HAVE_BLUEZ_5_BACKEND_HFP_NATIVE
static int sco_create_socket(struct impl *backend, struct spa_bt_adapter *adapter, bool msbc);
static bool device_supports_required_mSBC_transport_modes(
struct impl *backend, struct spa_bt_device *device) {
int sock;
struct impl *backend, struct spa_bt_device *device)
{
int res;
bool msbc_ok, msbc_alt1_ok;
uint32_t bt_features;
@ -575,43 +574,20 @@ static bool device_supports_required_mSBC_transport_modes(
if (!msbc_ok && !msbc_alt1_ok)
return false;
/*
* Check if adapter supports BT_VOICE_TRANSPARENT. Do this without
* directly probing HCI properties.
*/
sock = sco_create_socket(backend, device->adapter, true);
if (sock < 0) {
res = spa_bt_adapter_has_msbc(device->adapter);
if (res < 0) {
spa_log_warn(backend->log,
"adapter %s: failed to determine msbc/esco capability (%d)",
device->adapter->path, res);
} else if (res == 0) {
spa_log_info(backend->log,
"adapter %s: no msbc/esco transport",
device->adapter->path);
return false;
} else {
struct sockaddr_sco addr;
socklen_t len;
int res;
/* Connect to non-existent address */
len = sizeof(addr);
memset(&addr, 0, len);
addr.sco_family = AF_BLUETOOTH;
bacpy(&addr.sco_bdaddr, BDADDR_LOCAL);
spa_log_debug(backend->log, "connect to determine adapter msbc support...");
/* Linux kernel code checks for features needed for BT_VOICE_TRANSPARENT
* among the first checks it does, and fails with EOPNOTSUPP if not
* supported. The connection generally timeouts, so set it
* nonblocking since we are just checking.
*/
fcntl(sock, F_SETFL, O_NONBLOCK);
res = connect(sock, (struct sockaddr *) &addr, len);
if (res < 0)
res = errno;
else
res = 0;
close(sock);
spa_log_debug(backend->log, "determined adapter-msbc:%d res:%d",
(res != EOPNOTSUPP), res);
if (res == EOPNOTSUPP)
return false;
spa_log_debug(backend->log,
"adapter %s: has msbc/esco transport",
device->adapter->path);
}
/* Check if USB ALT6 is really available on the device */