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

bluez5: sco-io: we should always read from socket

Browse source 
Not reading from the socket appears to cause messages to pile up to some
limit, which causes problems if we start the source after some point.
This commit is contained in:
Pauli Virtanen 2022-06-19 03:06:16 +03:00 • committed by Wim Taymans
parent 02bdfcb115
commit 459a1114f1
1 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
spa/plugins/bluez5/sco-io.c
View file

@ -55,16 +55,12 @@
* since kernel might not report it as the socket MTU, see
* https://lore.kernel.org/linux-bluetooth/20201210003528.3pmaxvubiwegxmhl@pali/T/
*
* Since 24 is the packet size for the smallest setting (ALT1), we'll stop
* reading when rx packet of at least this size is seen, and use its size as the
* heuristic maximum write MTU. Of course, if we have a source connected, we'll
* continue reading without stopping.
* We continue reading also when there's no source connected, to keep socket
* flushed.
*
* XXX: when the kernel/backends start giving the right values, the heuristic
* XXX: can be removed
*/
#define HEURISTIC_MIN_MTU 24
#define MAX_MTU 1024
@ -94,12 +90,6 @@ static void update_source(struct spa_bt_sco_io *io)
int enabled;
int changed = 0;
enabled = io->source_cb != NULL || io->read_size < HEURISTIC_MIN_MTU;
if (SPA_FLAG_IS_SET(io->source.mask, SPA_IO_IN) != enabled) {
SPA_FLAG_UPDATE(io->source.mask, SPA_IO_IN, enabled);
changed = 1;
}
enabled = io->sink_cb != NULL;
if (SPA_FLAG_IS_SET(io->source.mask, SPA_IO_OUT) != enabled) {
SPA_FLAG_UPDATE(io->source.mask, SPA_IO_OUT, enabled);
@ -118,11 +108,6 @@ static void sco_io_on_ready(struct spa_source *source)
if (SPA_FLAG_IS_SET(source->rmask, SPA_IO_IN)) {
int res;
/*
* Note that we will read from the socket for a few times even
* when there is no source callback, to autodetect packet size.
*/
read_again:
res = read(io->fd, io->read_buffer, SPA_MIN(io->read_mtu, MAX_MTU));
if (res <= 0) {