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: use initial SCO RX wait workaround only for USB controllers

Browse source 
Kernel-provided MTU does not work for USB controllers and the correct
packet size to send can be known currently only from RX. So we are
waiting for RX to get it.

The known problem is USB-specific, we shouldn't need the workaround for
other transport types.

Don't wait for POLLIN for non-USB controllers on connect, but ready
things on POLLOUT as usual.

For non-USB controllers, pick some sensible packet sizes to use
initially, before we switch to same size as for RX.
This commit is contained in:
Pauli Virtanen 2024-05-12 12:41:36 +03:00
parent b3bd026699
commit b94d6e53a1
4 changed files with 54 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1733,8 +1733,8 @@ static void sco_event(struct spa_source *source)
}
}
if (source->rmask & SPA_IO_IN) {
SPA_FLAG_UPDATE(source->mask, SPA_IO_IN, false);
if (source->rmask & (SPA_IO_OUT | SPA_IO_IN)) {
SPA_FLAG_CLEAR(source->mask, SPA_IO_OUT | SPA_IO_IN);
spa_loop_update_source(backend->main_loop, source);
sco_ready(t);
}
@ -1750,15 +1750,25 @@ static void sco_start_source(struct spa_bt_transport *t)
td->err = -EINPROGRESS;
/*
* We on purpose wait for POLLIN when connecting (not POLLOUT as usual), to
* indicate ready only after we are sure the device is sending data.
*/
td->sco.func = sco_event;
td->sco.data = t;
td->sco.fd = t->fd;
td->sco.mask = SPA_IO_HUP | SPA_IO_ERR | SPA_IO_IN;
td->sco.mask = SPA_IO_HUP | SPA_IO_ERR;
td->sco.rmask = 0;
switch (t->device->adapter->bus_type) {
case BUS_TYPE_USB:
/* With USB controllers, we have to determine packet size from incoming
* packets before we can send. Wait for POLLIN when connecting (not
* POLLOUT as usual).
*/
td->sco.mask |= SPA_IO_IN;
break;
default:
td->sco.mask |= SPA_IO_OUT;
break;
}
spa_loop_add_source(backend->main_loop, &td->sco);
}