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

Revert "pulse-server: send chunks with half the fragsize"

Browse source 
This reverts commit e10305851d.

If causes some regressions: see #2671
This commit is contained in:
Wim Taymans 2022-09-05 16:19:00 +02:00
parent 83e83608c8
commit ad06db91ee
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -668,20 +668,14 @@ static uint32_t fix_record_buffer_attr(struct stream *s, struct buffer_attr *att
attr->fragsize = SPA_ROUND_UP(attr->fragsize, frame_size); attr->fragsize = SPA_ROUND_UP(attr->fragsize, frame_size);
attr->fragsize = SPA_MAX(attr->fragsize, minfrag); attr->fragsize = SPA_MAX(attr->fragsize, minfrag);
/* pulseaudio configures the source to half of the fragsize. It also attr->tlength = attr->minreq = attr->prebuf = 0;
* immediately sends chunks to clients. We use the minreq field to
* keep this info and use it to configure half the fragsize latency */
attr->minreq = attr->fragsize / 2;
attr->minreq = SPA_ROUND_UP(attr->minreq, frame_size);
attr->tlength = attr->prebuf = 0;
if (s->early_requests) { if (s->early_requests) {
latency = attr->minreq; latency = attr->fragsize;
} else if (s->adjust_latency) { } else if (s->adjust_latency) {
latency = attr->minreq; latency = attr->fragsize;
} else { } else {
latency = attr->minreq; latency = attr->fragsize;
} }
/* make sure can queue at least to fragsize without overruns */ /* make sure can queue at least to fragsize without overruns */
if (attr->maxlength < attr->fragsize * 4) if (attr->maxlength < attr->fragsize * 4)
@ -1330,18 +1324,18 @@ do_process_done(struct spa_loop *loop,
stream, client->name, index, avail); stream, client->name, index, avail);
} else { } else {
if ((uint32_t)avail > stream->attr.maxlength) { if ((uint32_t)avail > stream->attr.maxlength) {
uint32_t skip = avail - stream->attr.minreq; uint32_t skip = avail - stream->attr.fragsize;
/* overrun, catch up to latest fragment and send it */ /* overrun, catch up to latest fragment and send it */
pw_log_warn("%p: [%s] overrun recover read:%u avail:%d max:%u skip:%u", pw_log_warn("%p: [%s] overrun recover read:%u avail:%d max:%u skip:%u",
stream, client->name, index, avail, stream->attr.maxlength, skip); stream, client->name, index, avail, stream->attr.maxlength, skip);
index += skip; index += skip;
stream->read_index += skip; stream->read_index += skip;
avail = stream->attr.minreq; avail = stream->attr.fragsize;
} }
pw_log_trace("avail:%d index:%u", avail, index); pw_log_trace("avail:%d index:%u", avail, index);
while ((uint32_t)avail >= stream->attr.minreq) { while ((uint32_t)avail >= stream->attr.fragsize) {
towrite = SPA_MIN((uint32_t)avail, stream->attr.minreq); towrite = SPA_MIN((uint32_t)avail, stream->attr.fragsize);
msg = message_alloc(impl, stream->channel, towrite); msg = message_alloc(impl, stream->channel, towrite);
if (msg == NULL) if (msg == NULL)