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

pulse-server: don't write too small buffers

Browse source 
Fixes #399
This commit is contained in:
Wim Taymans 2020-12-11 18:09:21 +01:00
parent d71259a02c
commit 00295b64b5
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/modules/module-protocol-pulse/defs.h
View file

@ -42,6 +42,7 @@
#define MIN_BUFFERS 8u #define MIN_BUFFERS 8u
#define MAX_BUFFERS 64u #define MAX_BUFFERS 64u
#define MIN_BLOCK 64u
#define MIN_SAMPLES 16u #define MIN_SAMPLES 16u
#define MIN_USEC (MIN_SAMPLES * SPA_USEC_PER_SEC / 48000u) #define MIN_USEC (MIN_SAMPLES * SPA_USEC_PER_SEC / 48000u)

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

@ -183,6 +183,7 @@ struct stream {
struct channel_map map; struct channel_map map;
struct buffer_attr attr; struct buffer_attr attr;
uint32_t frame_size; uint32_t frame_size;
uint32_t minblock;
struct volume volume; struct volume volume;
bool muted; bool muted;
@ -998,9 +999,9 @@ static void fix_playback_buffer_attr(struct stream *s, struct buffer_attr *attr)
s->missing = attr->tlength; s->missing = attr->tlength;
attr->fragsize = 0; attr->fragsize = 0;
pw_log_info(NAME" %p: [%s] maxlength:%u tlength:%u minreq:%u prebuf:%u", s, pw_log_info(NAME" %p: [%s] maxlength:%u tlength:%u minreq:%u prebuf:%u minblock:%u", s,
s->client->name, attr->maxlength, attr->tlength, s->client->name, attr->maxlength, attr->tlength,
attr->minreq, attr->prebuf); attr->minreq, attr->prebuf, s->minblock);
} }
static int reply_create_playback_stream(struct stream *stream) static int reply_create_playback_stream(struct stream *stream)
@ -1294,6 +1295,7 @@ static void stream_param_changed(void *data, uint32_t id, const struct spa_pod *
pw_stream_set_error(stream->stream, res, "format not supported"); pw_stream_set_error(stream->stream, res, "format not supported");
return; return;
} }
stream->minblock = MIN_BLOCK * stream->frame_size;
if (stream->create_tag != SPA_ID_INVALID) { if (stream->create_tag != SPA_ID_INVALID) {
stream->id = pw_stream_get_node_id(stream->stream); stream->id = pw_stream_get_node_id(stream->stream);
@ -1412,7 +1414,7 @@ static void stream_process(void *data)
void *p; void *p;
struct pw_buffer *buffer; struct pw_buffer *buffer;
struct spa_buffer *buf; struct spa_buffer *buf;
uint32_t size; uint32_t size, minreq;
struct process_data pd; struct process_data pd;
pw_log_trace(NAME" %p: process", stream); pw_log_trace(NAME" %p: process", stream);
@ -1429,9 +1431,10 @@ static void stream_process(void *data)
if (stream->direction == PW_DIRECTION_OUTPUT) { if (stream->direction == PW_DIRECTION_OUTPUT) {
int32_t avail = spa_ringbuffer_get_read_index(&stream->ring, &pd.read_index); int32_t avail = spa_ringbuffer_get_read_index(&stream->ring, &pd.read_index);
minreq = SPA_MAX(stream->minblock, stream->attr.minreq);
if (avail <= 0) { if (avail <= 0) {
/* underrun, produce a silence buffer */ /* underrun, produce a silence buffer */
size = SPA_MIN(buf->datas[0].maxsize, stream->attr.minreq); size = SPA_MIN(buf->datas[0].maxsize, minreq);
memset(p, 0, size); memset(p, 0, size);
if (stream->draining) { if (stream->draining) {
@ -1452,7 +1455,7 @@ static void stream_process(void *data)
avail = stream->attr.maxlength; avail = stream->attr.maxlength;
} }
size = SPA_MIN(buf->datas[0].maxsize, (uint32_t)avail); size = SPA_MIN(buf->datas[0].maxsize, (uint32_t)avail);
size = SPA_MIN(size, stream->attr.minreq); size = SPA_MIN(size, minreq);
spa_ringbuffer_read_data(&stream->ring, spa_ringbuffer_read_data(&stream->ring,
stream->buffer, stream->attr.maxlength, stream->buffer, stream->attr.maxlength,