mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: Handle clients that send more than requested

Browse source 
A client can sometimes send more data than we requested. PulseAudio
keeps the extra data around, it just asks for more data when it consumed
some of it.

PipeWire however always tries to keep tlength worth of data, as
specified in the PulseAudio docs... Keep track of how much extra data
has been sent and keep this around as well. Make sure we flush this
extra data as well.

Fixes #2626
This commit is contained in:
Wim Taymans 2022-09-07 13:07:28 +02:00
parent 50f76c8730
commit a79b5c86ea
3 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/module-protocol-pulse/server.c
View file

@ -172,6 +172,10 @@ static int handle_memblock(struct client *client, struct message *msg)
} else if (filled + msg->length > stream->attr.maxlength) {
/* overrun */
stream_send_overflow(stream);
} else if (filled + msg->length > stream->attr.tlength) {
stream->extra_tlength = filled + msg->length - stream->attr.tlength;
pw_log_info("client %p [%s]: received %u more than asked for channel %d",
client, client->name, stream->extra_tlength, channel);
}
/* always write data to ringbuffer, we expect the other side

2
src/modules/module-protocol-pulse/stream.c
View file

@ -163,6 +163,7 @@ void stream_flush(struct stream *stream)
if (stream->attr.prebuf > 0)
stream->in_prebuf = true;
stream->extra_tlength = 0;
stream->playing_for = 0;
stream->underrun_for = -1;
stream->is_underrun = true;
@ -193,6 +194,7 @@ uint32_t stream_pop_missing(struct stream *stream)
avail = stream->write_index - stream->read_index;
missing = stream->attr.tlength;
missing += stream->extra_tlength;
missing -= stream->requested;
missing -= avail;

1
src/modules/module-protocol-pulse/stream.h
View file

@ -97,6 +97,7 @@ struct stream {
struct sample_spec ss;
struct channel_map map;
struct buffer_attr attr;
uint32_t extra_tlength;
uint32_t frame_size;
uint32_t rate;
uint64_t lat_usec;