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

avb: handle xruns better

Browse source 
Don't stop early, fill gaps with silence.
This commit is contained in:
Wim Taymans 2022-03-11 15:28:08 +01:00
parent 87053365ea
commit c79fddf007
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
spa/plugins/avb/avb-pcm.c
View file

@ -895,7 +895,6 @@ static int flush_write(struct state *state, uint64_t current_time)
n = sendmsg(state->sockfd, &state->msg, 0); n = sendmsg(state->sockfd, &state->msg, 0);
if (n < 0 || n != (ssize_t)state->pdu_size) { if (n < 0 || n != (ssize_t)state->pdu_size) {
spa_log_error(state->log, "sendmdg() failed: %m"); spa_log_error(state->log, "sendmdg() failed: %m");
return -errno;
} }
txtime += state->pdu_period; txtime += state->pdu_period;
ptime += state->pdu_period; ptime += state->pdu_period;
@ -988,23 +987,28 @@ int spa_avb_read(struct state *state)
avail = spa_ringbuffer_get_read_index(&state->ring, &index); avail = spa_ringbuffer_get_read_index(&state->ring, &index);
wanted = state->duration * state->stride; wanted = state->duration * state->stride;
if (avail < wanted) { if (spa_list_is_empty(&port->free)) {
spa_log_warn(state->log, "capture underrun %d < %d", avail, wanted); spa_log_warn(state->log, "out of buffers");
return 0; return -EPIPE;
} }
if (spa_list_is_empty(&port->free))
return 0;
b = spa_list_first(&port->free, struct buffer, link); b = spa_list_first(&port->free, struct buffer, link);
d = b->buf->datas; d = b->buf->datas;
n_bytes = SPA_MIN(d[0].maxsize, (uint32_t)wanted); n_bytes = SPA_MIN(d[0].maxsize, (uint32_t)wanted);
spa_ringbuffer_read_data(&state->ring, if (avail < wanted) {
state->ringbuffer_data, spa_log_warn(state->log, "capture underrun %d < %d", avail, wanted);
state->ringbuffer_size, memset(d[0].data, 0, n_bytes);
index % state->ringbuffer_size, } else {
d[0].data, n_bytes); spa_ringbuffer_read_data(&state->ring,
state->ringbuffer_data,
state->ringbuffer_size,
index % state->ringbuffer_size,
d[0].data, n_bytes);
index += n_bytes;
spa_ringbuffer_read_update(&state->ring, index);
}
d[0].chunk->offset = 0; d[0].chunk->offset = 0;
d[0].chunk->size = n_bytes; d[0].chunk->size = n_bytes;
@ -1014,9 +1018,6 @@ int spa_avb_read(struct state *state)
spa_list_remove(&b->link); spa_list_remove(&b->link);
spa_list_append(&port->ready, &b->link); spa_list_append(&port->ready, &b->link);
index += n_bytes;
avail -= n_bytes;
spa_ringbuffer_read_update(&state->ring, index);
return 0; return 0;
} }