mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-28 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

abort snd_pcm_dmix_drain when state is SND_PCM_STATE_XRU

Browse source 
From: Sascha Sommer <saschasommer@freenet.de>

this is a fix for bug 0001559.
Unlike my first guesses the real problem is not in the kernel driver but in
alsa-lib. Whenever the current dmix status is xrun and snd_pcm_dmix_drain
gets called the process will hang forever in the poll function. The reason is
that poll gets called even though the timer already stopped.
As described in the bugtracking system this bug was not noticable with alsa
versions that used the old IOCTLS because the SNDRV_TIMER_IOCTL_STOP ioctl
never reached the timer kernel module.

Attached patch fixes this problem for alsa-lib 1.0.10 by simply calling
snd_pcm_dmix_drop when snd_pcm_dmix_drain gets called in the state
SND_PCM_STATE_XRUN.
This commit is contained in:
Takashi Iwai 2005-11-21 10:47:42 +00:00
parent 5057f8bbea
commit 8495f42feb
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pcm/pcm_dmix.c
View file

@ -532,6 +532,12 @@ static int snd_pcm_dmix_drain(snd_pcm_t *pcm)
return 0;
}
}
if (dmix->state == SND_PCM_STATE_XRUN) {
snd_pcm_dmix_drop(pcm);
return 0;
}
stop_threshold = pcm->stop_threshold;
if (pcm->stop_threshold > pcm->buffer_size)
pcm->stop_threshold = pcm->buffer_size;