mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

stream: only queue buffer when filled

Browse source 
We need to completely fill the buffer before we queue the buffer. If we
don't do this, we might have reported a larger writable size than
what we actually can do and that makes clients fail.

This is not entirely completely correct because a client can expect to
have its buffer sent as soon as it completes the write. We should really
just queue the data in a separate queue when we run out of buffers.
This commit is contained in:
Wim Taymans 2018-10-16 09:58:14 +02:00
parent f74a0fb9bd
commit b742d7533e
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/stream.c
View file

@ -953,7 +953,6 @@ int peek_buffer(pa_stream *s)
}
else {
s->buffer_size = s->buffer->buffer->datas[0].maxsize;
s->buffer_offset = 0;
}
return 0;
}
@ -975,6 +974,7 @@ int queue_buffer(pa_stream *s)
pw_stream_queue_buffer(s->stream, s->buffer);
s->buffer = NULL;
s->buffer_offset = 0;
return 0;
}
@ -1070,21 +1070,26 @@ int pa_stream_write_ext_free(pa_stream *s,
if (pa_stream_begin_write(s, &dst, &dsize) < 0 ||
dst == NULL || dsize == 0) {
pw_log_debug("out of buffers");
pw_log_debug("stream %p: out of buffers, wanted %zd bytes", s, nbytes);
break;
}
memcpy(dst, src, dsize);
s->buffer->buffer->datas[0].chunk->offset = 0;
s->buffer->buffer->datas[0].chunk->size = dsize;
queue_buffer(s);
s->buffer_offset += dsize;
if (s->buffer_offset >= s->buffer_size) {
s->buffer->buffer->datas[0].chunk->offset = 0;
s->buffer->buffer->datas[0].chunk->size = s->buffer_offset;
queue_buffer(s);
}
towrite -= dsize;
src += dsize;
}
if (free_cb)
free_cb(free_cb_data);
s->buffer = NULL;
}
else {
s->buffer->buffer->datas[0].chunk->offset = data - s->buffer_data;
@ -1147,6 +1152,7 @@ size_t pa_stream_writable_size(pa_stream *s)
PA_CHECK_VALIDITY_RETURN_ANY(s->context, s->direction != PA_STREAM_RECORD,
PA_ERR_BADSTATE, (size_t) -1);
pw_log_trace("stream %p: %zd", s, s->dequeued_size);
return s->dequeued_size;
}