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: use rate match to read from ringbuffer

Browse source 
Use the rate match io are to read the exact amount of samples we
need for this cycle from the ringbuffer. We can then request lower
latency.

There will also be less buffering in the audioconverter, which makes
our timestamps more accurate.
This commit is contained in:
Wim Taymans 2021-01-08 17:22:15 +01:00
parent 3f0cadfa00
commit f94d2e7da5
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,6 +165,7 @@ struct stream {
struct pw_stream *stream; struct pw_stream *stream;
struct spa_hook stream_listener; struct spa_hook stream_listener;
struct spa_io_rate_match *rate_match;
struct spa_ringbuffer ring; struct spa_ringbuffer ring;
void *buffer; void *buffer;
@ -1025,7 +1026,7 @@ static int reply_create_playback_stream(struct stream *stream)
spa_ringbuffer_init(&stream->ring); spa_ringbuffer_init(&stream->ring);
lat.num = stream->attr.minreq * 2 / stream->frame_size; lat.num = stream->attr.minreq / stream->frame_size;
lat.denom = stream->ss.rate; lat.denom = stream->ss.rate;
lat_usec = lat.num * SPA_USEC_PER_SEC / lat.denom; lat_usec = lat.num * SPA_USEC_PER_SEC / lat.denom;
@ -1323,6 +1324,16 @@ static void stream_param_changed(void *data, uint32_t id, const struct spa_pod *
pw_stream_update_params(stream->stream, params, n_params); pw_stream_update_params(stream->stream, params, n_params);
} }
static void stream_io_changed(void *data, uint32_t id, void *area, uint32_t size)
{
struct stream *stream = data;
switch (id) {
case SPA_IO_RateMatch:
stream->rate_match = area;
break;
}
}
struct process_data { struct process_data {
struct pw_time pwt; struct pw_time pwt;
uint32_t read_index; uint32_t read_index;
@ -1432,6 +1443,7 @@ 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); minreq = SPA_MAX(stream->minblock, stream->attr.minreq);
minreq = SPA_MIN(minreq, stream->rate_match->size * stream->frame_size);
if (avail <= 0) { if (avail <= 0) {
/* underrun, produce a silence buffer */ /* underrun, produce a silence buffer */
size = SPA_MIN(buf->datas[0].maxsize, minreq); size = SPA_MIN(buf->datas[0].maxsize, minreq);
@ -1520,6 +1532,7 @@ static const struct pw_stream_events stream_events =
PW_VERSION_STREAM_EVENTS, PW_VERSION_STREAM_EVENTS,
.state_changed = stream_state_changed, .state_changed = stream_state_changed,
.param_changed = stream_param_changed, .param_changed = stream_param_changed,
.io_changed = stream_io_changed,
.process = stream_process, .process = stream_process,
.drained = stream_drained, .drained = stream_drained,
}; };