From 9c34a923dbd2155c195181ee8f884907e7c9ec04 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 1 Sep 2022 16:46:18 +0200 Subject: [PATCH] pulse-server: simplify latency handling We don't need to use the minreq field. The fragsize is only updated when adjust_latency is used. --- .../module-protocol-pulse/pulse-server.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c index 0e8c8f90b..ff7e1e995 100644 --- a/src/modules/module-protocol-pulse/pulse-server.c +++ b/src/modules/module-protocol-pulse/pulse-server.c @@ -669,14 +669,12 @@ static uint32_t fix_record_buffer_attr(struct stream *s, struct buffer_attr *att attr->fragsize = SPA_MAX(attr->fragsize, minfrag); /* pulseaudio configures the source to half of the fragsize. It also - * 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 / 3; - attr->minreq = SPA_ROUND_UP(attr->minreq, frame_size); - latency = attr->minreq; + * immediately sends chunks to clients. Configure a 2/3 of the fragsize + * as the latency. */ + latency = attr->fragsize * 2 / 3; if (s->adjust_latency) - attr->fragsize = latency; + attr->fragsize = SPA_ROUND_UP(latency, frame_size); attr->tlength = attr->prebuf = 0; @@ -1327,18 +1325,18 @@ do_process_done(struct spa_loop *loop, stream, client->name, index, avail); } else { 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 */ pw_log_warn("%p: [%s] overrun recover read:%u avail:%d max:%u skip:%u", stream, client->name, index, avail, stream->attr.maxlength, skip); index += skip; stream->read_index += skip; - avail = stream->attr.minreq; + avail = stream->attr.fragsize; } pw_log_trace("avail:%d index:%u", avail, index); - while ((uint32_t)avail >= stream->attr.minreq) { - towrite = SPA_MIN((uint32_t)avail, stream->attr.minreq); + while ((uint32_t)avail >= stream->attr.fragsize) { + towrite = SPA_MIN((uint32_t)avail, stream->attr.fragsize); msg = message_alloc(impl, stream->channel, towrite); if (msg == NULL)