mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-05 13:30:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pcm: fix wait condition in snd_pcm_write_areas() to avoid return zero

Browse source 
The hw_ptr might be updated during the snd_pcm_may_wait_for_avail_min() call,
so even if it returns zero (OK), the avail must be updated again.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-04-09 09:14:33 +02:00
parent 4694a6643d
commit c7fc3fdbe2
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/pcm/pcm.c
View file

@ -7389,18 +7389,27 @@ snd_pcm_sframes_t snd_pcm_write_areas(snd_pcm_t *pcm, const snd_pcm_channel_area
err = avail; err = avail;
goto _end; goto _end;
} }
if ((state == SND_PCM_STATE_RUNNING && if (state == SND_PCM_STATE_RUNNING &&
size > (snd_pcm_uframes_t)avail && size > (snd_pcm_uframes_t)avail) {
snd_pcm_may_wait_for_avail_min(pcm, avail))) { if (snd_pcm_may_wait_for_avail_min(pcm, avail)) {
if (pcm->mode & SND_PCM_NONBLOCK) { if (pcm->mode & SND_PCM_NONBLOCK) {
err = -EAGAIN; err = -EAGAIN;
goto _end;
}
err = snd_pcm_wait_nocheck(pcm, -1);
if (err < 0)
break;
goto _again;
}
/* the snd_pcm_may_wait_for_avail_min may check against the
* updated hw.ptr (slaves), get the avail again here
*/
avail = __snd_pcm_avail_update(pcm);
if (avail < 0) {
err = avail;
goto _end; goto _end;
} }
err = snd_pcm_wait_nocheck(pcm, -1);
if (err < 0)
break;
goto _again;
} }
frames = size; frames = size;
if (frames > (snd_pcm_uframes_t) avail) if (frames > (snd_pcm_uframes_t) avail)