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

alsa: tweak xrun recovery

Browse source 
Don't try to resync right after a xrun.
Init the dll after reslaving.
This commit is contained in:
Wim Taymans 2019-10-18 22:53:02 +02:00
parent 2e3608a34f
commit f5b9862a89
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
spa/plugins/alsa/alsa-pcm.c
View file

@ -574,6 +574,7 @@ static int alsa_recover(struct state *state, int err)
return res; return res;
} }
init_loop(state); init_loop(state);
state->alsa_recovering = true;
if (state->stream == SND_PCM_STREAM_CAPTURE) { if (state->stream == SND_PCM_STREAM_CAPTURE) {
if ((res = snd_pcm_start(state->hndl)) < 0) { if ((res = snd_pcm_start(state->hndl)) < 0) {
@ -586,6 +587,7 @@ static int alsa_recover(struct state *state, int err)
state->alsa_started = false; state->alsa_started = false;
spa_alsa_write(state, state->threshold * 2); spa_alsa_write(state, state->threshold * 2);
} }
return 0; return 0;
} }
@ -599,6 +601,8 @@ static int get_status(struct state *state, snd_pcm_uframes_t *delay, snd_pcm_ufr
return res; return res;
if ((avail = snd_pcm_avail(state->hndl)) < 0) if ((avail = snd_pcm_avail(state->hndl)) < 0)
return avail; return avail;
} else {
state->alsa_recovering = false;
} }
@ -713,7 +717,7 @@ int spa_alsa_write(struct state *state, snd_pcm_uframes_t silence)
if ((res = get_status(state, &delay, &target)) < 0) if ((res = get_status(state, &delay, &target)) < 0)
return res; return res;
if (delay > target + state->threshold) { if (!state->alsa_recovering && delay > target + state->threshold) {
spa_log_warn(state->log, NAME" %p: slave delay:%ld resync %f %f %f", spa_log_warn(state->log, NAME" %p: slave delay:%ld resync %f %f %f",
state, delay, state->z1, state->z2, state->z3); state, delay, state->z1, state->z2, state->z3);
init_loop(state); init_loop(state);
@ -929,7 +933,7 @@ int spa_alsa_read(struct state *state, snd_pcm_uframes_t silence)
if ((res = get_status(state, &delay, &target)) < 0) if ((res = get_status(state, &delay, &target)) < 0)
return res; return res;
if (delay < target) { if (!state->alsa_recovering && delay < target) {
spa_log_warn(state->log, NAME" %p: slave delay:%lu resync %f %f %f", spa_log_warn(state->log, NAME" %p: slave delay:%lu resync %f %f %f",
state, delay, state->z1, state->z2, state->z3); state, delay, state->z1, state->z2, state->z3);
init_loop(state); init_loop(state);
@ -1198,6 +1202,7 @@ static int do_reslave(struct spa_loop *loop,
{ {
struct state *state = user_data; struct state *state = user_data;
set_timers(state); set_timers(state);
init_loop(state);
return 0; return 0;
} }

1
spa/plugins/alsa/alsa-pcm.h
View file

@ -133,6 +133,7 @@ struct state {
uint64_t last_position; uint64_t last_position;
unsigned int alsa_started:1; unsigned int alsa_started:1;
unsigned int alsa_sync:1; unsigned int alsa_sync:1;
unsigned int alsa_recovering:1;
unsigned int slaved:1; unsigned int slaved:1;
int64_t sample_count; int64_t sample_count;