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: handle negative values from snd_pcm_mmap_hw_avail

Browse source 
Such negative values can happen when an underrun happens and xrun
detection is disabled. Another situation is if the device updated the
pointer before alsa-lib has a chance to detect the xrun.

The problem is that these negative values could propagate to the
snd_pcm_rewindable return value, where it is specified that negative
returns must be interpreted as error codes and not as negative amount of
samples.

Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Alexander E. Patrakov 2014-09-14 00:30:15 +06:00 • committed by Jaroslav Kysela
parent 9a43dc15b2
commit 78c804fc93
6 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pcm/pcm_local.h
View file

@ -464,6 +464,24 @@ static inline snd_pcm_sframes_t snd_pcm_mmap_hw_avail(snd_pcm_t *pcm)
return pcm->buffer_size - snd_pcm_mmap_avail(pcm);
}
static inline snd_pcm_sframes_t snd_pcm_mmap_playback_hw_rewindable(snd_pcm_t *pcm)
{
snd_pcm_sframes_t ret = snd_pcm_mmap_playback_hw_avail(pcm);
return (ret >= 0) ? ret : 0;
}
static inline snd_pcm_sframes_t snd_pcm_mmap_capture_hw_rewindable(snd_pcm_t *pcm)
{
snd_pcm_sframes_t ret = snd_pcm_mmap_capture_hw_avail(pcm);
return (ret >= 0) ? ret : 0;
}
static inline snd_pcm_uframes_t snd_pcm_mmap_hw_rewindable(snd_pcm_t *pcm)
{
snd_pcm_sframes_t ret = snd_pcm_mmap_hw_avail(pcm);
return (ret >= 0) ? ret : 0;
}
static inline const snd_pcm_channel_area_t *snd_pcm_mmap_areas(snd_pcm_t *pcm)
{
if (pcm->stopped_areas &&