mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: retry _avail after xrun

Browse source 
..or else we pretend all is fine and end up with no available samples
to read in an infinite loop.
This commit is contained in:
Wim Taymans 2018-11-29 15:19:33 +01:00
parent a195700eac
commit 354bb042e2
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spa/plugins/alsa/alsa-utils.c
View file

@ -547,9 +547,14 @@ static int alsa_recover(struct state *state, int err)
static int get_status(struct state *state, snd_pcm_sframes_t *delay) static int get_status(struct state *state, snd_pcm_sframes_t *delay)
{ {
snd_pcm_sframes_t av; snd_pcm_sframes_t av;
int res;
if ((av = snd_pcm_avail(state->hndl)) < 0) if ((av = snd_pcm_avail(state->hndl)) < 0) {
return alsa_recover(state, av); if ((res = alsa_recover(state, av)) < 0)
return res;
if ((av = snd_pcm_avail(state->hndl)) < 0)
return av;
}
if (delay) { if (delay) {
if (state->stream == SND_PCM_STREAM_PLAYBACK) if (state->stream == SND_PCM_STREAM_PLAYBACK)
@ -911,6 +916,7 @@ static void alsa_on_capture_timeout_event(struct spa_source *source)
snd_pcm_uframes_t read, frames, offset; snd_pcm_uframes_t read, frames, offset;
frames = to_read - total_read; frames = to_read - total_read;
spa_log_trace(state->log, "begin %ld %ld %ld %ld", offset, frames, to_read, total_read);
if ((res = snd_pcm_mmap_begin(hndl, &my_areas, &offset, &frames)) < 0) { if ((res = snd_pcm_mmap_begin(hndl, &my_areas, &offset, &frames)) < 0) {
spa_log_error(state->log, "snd_pcm_mmap_begin error: %s", snd_strerror(res)); spa_log_error(state->log, "snd_pcm_mmap_begin error: %s", snd_strerror(res));
return; return;
@ -920,6 +926,7 @@ static void alsa_on_capture_timeout_event(struct spa_source *source)
if (read < frames) if (read < frames)
to_read = 0; to_read = 0;
spa_log_trace(state->log, "commit %ld %ld", offset, read);
if ((res = snd_pcm_mmap_commit(hndl, offset, read)) < 0) { if ((res = snd_pcm_mmap_commit(hndl, offset, read)) < 0) {
spa_log_error(state->log, "snd_pcm_mmap_commit error: %s", snd_strerror(res)); spa_log_error(state->log, "snd_pcm_mmap_commit error: %s", snd_strerror(res));
if (res != -EPIPE && res != -ESTRPIPE) if (res != -EPIPE && res != -ESTRPIPE)