mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-18 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "pulse-server: simplify latency handling"

Browse source 
This reverts commit 9c34a923db.
This commit is contained in:
Wim Taymans 2022-09-05 16:18:45 +02:00
parent 72ce2f815b
commit 009ab9681d
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -669,12 +669,14 @@ static uint32_t fix_record_buffer_attr(struct stream *s, struct buffer_attr *att
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 /* pulseaudio configures the source to half of the fragsize. It also
* immediately sends chunks to clients. Configure a 2/3 of the fragsize * immediately sends chunks to clients. We use the minreq field to
* as the latency. */ * keep this info and use it to configure half the fragsize latency */
latency = attr->fragsize * 2 / 3; attr->minreq = attr->fragsize * 2 / 3;
attr->minreq = SPA_ROUND_UP(attr->minreq, frame_size);
latency = attr->minreq;
if (s->adjust_latency) if (s->adjust_latency)
attr->fragsize = SPA_ROUND_UP(latency, frame_size); attr->fragsize = latency;
attr->tlength = attr->prebuf = 0; attr->tlength = attr->prebuf = 0;
@ -1325,18 +1327,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.fragsize; uint32_t skip = avail - stream->attr.minreq;
/* 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.fragsize; avail = stream->attr.minreq;
} }
pw_log_trace("avail:%d index:%u", avail, index); pw_log_trace("avail:%d index:%u", avail, index);
while ((uint32_t)avail >= stream->attr.fragsize) { while ((uint32_t)avail >= stream->attr.minreq) {
towrite = SPA_MIN((uint32_t)avail, stream->attr.fragsize); towrite = SPA_MIN((uint32_t)avail, stream->attr.minreq);
msg = message_alloc(impl, stream->channel, towrite); msg = message_alloc(impl, stream->channel, towrite);
if (msg == NULL) if (msg == NULL)