From: Alexander E. Patrakov Date: Sat, 13 Sep 2014 18:30:18 +0000 (+0600) Subject: rate: handle negative values from snd_pcm_mmap_playback_hw_avail X-Git-Tag: v1.0.29~46 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=ff9d213ff80f6fe0456565d4f524366443217174;p=alsa-lib.git rate: handle negative values from snd_pcm_mmap_playback_hw_avail Such negative returns are possible during an underrun if xrun detection is disabled. So, don't store the result in an unsigned variable (where it will overflow), and postpone the trigger in such case, too. Signed-off-by: Alexander E. Patrakov Signed-off-by: Jaroslav Kysela --- diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index b436a8ea..736d5583 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -1058,7 +1058,7 @@ static snd_pcm_state_t snd_pcm_rate_state(snd_pcm_t *pcm) static int snd_pcm_rate_start(snd_pcm_t *pcm) { snd_pcm_rate_t *rate = pcm->private_data; - snd_pcm_uframes_t avail; + snd_pcm_sframes_t avail; if (pcm->stream == SND_PCM_STREAM_CAPTURE) return snd_pcm_start(rate->gen.slave); @@ -1069,7 +1069,7 @@ static int snd_pcm_rate_start(snd_pcm_t *pcm) gettimestamp(&rate->trigger_tstamp, pcm->tstamp_type); avail = snd_pcm_mmap_playback_hw_avail(rate->gen.slave); - if (avail == 0) { + if (avail <= 0) { /* postpone the trigger since we have no data committed yet */ rate->start_pending = 1; return 0;