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

stream: use more accurate queued bytes and maxsize

Browse source 
Make lower latency streams work better.
This commit is contained in:
Wim Taymans 2020-09-18 17:59:01 +02:00
parent f777da9feb
commit 7c5192bc31
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pipewire-pulseaudio/src/stream.c
View file

@ -346,7 +346,7 @@ static void update_timing_info(pa_stream *s)
ti->write_index = pos; ti->write_index = pos;
} }
s->timing_info_valid = true; s->timing_info_valid = true;
s->queued_bytes = pwt.queued; s->queued_bytes = pwt.queued + s->ready_bytes;
pw_log_trace("stream %p: %"PRIu64" rate:%d/%d ticks:%"PRIu64" pos:%"PRIu64" delay:%"PRIi64 " read:%"PRIu64 pw_log_trace("stream %p: %"PRIu64" rate:%d/%d ticks:%"PRIu64" pos:%"PRIu64" delay:%"PRIi64 " read:%"PRIu64
" write:%"PRIu64" queued:%"PRIi64, " write:%"PRIu64" queued:%"PRIi64,
@ -373,12 +373,14 @@ static void queue_output(pa_stream *s)
pw_log_trace("queue %p", m); pw_log_trace("queue %p", m);
spa_list_remove(&m->link); spa_list_remove(&m->link);
s->ready_bytes -= m->size; s->ready_bytes -= m->size;
s->queued_bytes += m->size;
buf->buffer->datas[0].maxsize = m->maxsize; buf->buffer->datas[0].maxsize = m->maxsize;
buf->buffer->datas[0].data = m->data; buf->buffer->datas[0].data = m->data;
buf->buffer->datas[0].chunk->offset = m->offset; buf->buffer->datas[0].chunk->offset = m->offset;
buf->buffer->datas[0].chunk->size = m->size; buf->buffer->datas[0].chunk->size = m->size;
buf->user_data = m; buf->user_data = m;
buf->size = m->size;
m->user_data = buf; m->user_data = buf;
pw_stream_queue_buffer(s->stream, buf); pw_stream_queue_buffer(s->stream, buf);
@ -437,13 +439,12 @@ static void stream_process(void *data)
update_timing_info(s); update_timing_info(s);
if (s->direction == PA_STREAM_PLAYBACK) { if (s->direction == PA_STREAM_PLAYBACK) {
pa_timing_info *i = &s->timing_info;
uint64_t queued, writable, required; uint64_t queued, writable, required;
queue_output(s); queue_output(s);
queued = i->write_index - SPA_MIN(i->read_index, i->write_index); queued = s->queued_bytes;
writable = s->maxblock - SPA_MIN(queued, s->maxblock); writable = s->maxsize - SPA_MIN(queued, s->maxsize);
required = SPA_MIN(s->maxblock, s->buffer_attr.minreq); required = SPA_MIN(s->maxblock, s->buffer_attr.minreq);
if (s->write_callback && s->state == PA_STREAM_READY && writable >= required) if (s->write_callback && s->state == PA_STREAM_READY && writable >= required)
@ -1254,10 +1255,10 @@ size_t pa_stream_writable_size(PA_CONST pa_stream *s)
elapsed = 0; elapsed = 0;
} }
queued = i->write_index - SPA_MIN(i->read_index, i->write_index); queued = s->queued_bytes;
queued -= SPA_MIN(queued, elapsed); queued -= SPA_MIN(queued, elapsed);
writable = s->maxblock - SPA_MIN(queued, s->maxblock); writable = s->maxsize - SPA_MIN(queued, s->maxsize);
required = SPA_MIN(s->maxblock, s->buffer_attr.minreq); required = SPA_MIN(s->maxblock, s->buffer_attr.minreq);
pw_log_debug("stream %p: %"PRIu64" minreq:%u maxblock:%zu", s, pw_log_debug("stream %p: %"PRIu64" minreq:%u maxblock:%zu", s,