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

pulse-server: Fix REQUEST missing bytes

Browse source 
Also count the amount of underrun bytes as missing so that we request
them from the client.

Provide one fragment of minreq when we underrun instead of the full
buffer size.

Fixes #395
This commit is contained in:
Wim Taymans 2020-11-20 14:56:23 +01:00
parent dae64bd2b5
commit d5680a119f
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -989,9 +989,6 @@ static int reply_create_playback_stream(struct stream *stream)
spa_ringbuffer_init(&stream->ring);
pw_log_info(NAME" %p: [%s] reply CREATE_PLAYBACK_STREAM tag:%u", stream,
client->name, stream->create_tag);
lat.num = stream->attr.minreq * 2 / stream->frame_size;
lat.denom = stream->ss.rate;
lat_usec = lat.num * SPA_USEC_PER_SEC / lat.denom;
@ -1004,6 +1001,9 @@ static int reply_create_playback_stream(struct stream *stream)
size = stream_pop_missing(stream);
pw_log_info(NAME" %p: [%s] reply CREATE_PLAYBACK_STREAM tag:%u size:%u latency:%s",
stream, client->name, stream->create_tag, size, latency);
reply = reply_new(client, stream->create_tag);
message_put(reply,
TAG_U32, stream->channel, /* stream index/channel */
@ -1324,7 +1324,7 @@ do_process_done(struct spa_loop *loop,
else
send_stream_started(stream);
}
stream->missing += pd->playing_for;
stream->missing += pd->playing_for + pd->underrun_for;
stream->playing_for += pd->playing_for;
stream->underrun_for += pd->underrun_for;
@ -1393,7 +1393,7 @@ static void stream_process(void *data)
int32_t avail = spa_ringbuffer_get_read_index(&stream->ring, &pd.read_index);
if (avail <= 0) {
/* underrun, produce a silence buffer */
size = buf->datas[0].maxsize;
size = SPA_MIN(buf->datas[0].maxsize, stream->attr.minreq);
memset(p, 0, size);
if (stream->draining) {