output/alsa: check PCM state before calling snd_pcm_drain()
Apparently, if snd_pcm_drain() returns EAGAIN, it does not actually want to be called again; the next call will snd_pcm_drain() will also return EAGAIN, forever, even though the PCM state has meanwhile switched to SND_PCM_STATE_SETUP. This causes a busy loop; to fix this, we should always check snd_pcm_state() to see if draining is really required.
This commit is contained in:
parent
8bf3f9b874
commit
543776d9c9
1
NEWS
1
NEWS
@ -4,6 +4,7 @@ ver 0.21.11 (not yet released)
|
|||||||
* decoder
|
* decoder
|
||||||
- wildmidi: log error if library initialization fails
|
- wildmidi: log error if library initialization fails
|
||||||
* output
|
* output
|
||||||
|
- alsa: fix busy loop while draining
|
||||||
- alsa, osx: fix distortions with DSD_U32 and DoP on 32 bit CPUs
|
- alsa, osx: fix distortions with DSD_U32 and DoP on 32 bit CPUs
|
||||||
* protocol
|
* protocol
|
||||||
- fix "list" with multiple "group" levels
|
- fix "list" with multiple "group" levels
|
||||||
|
@ -774,6 +774,24 @@ AlsaOutput::DrainInternal()
|
|||||||
don't need to drain it */
|
don't need to drain it */
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
switch (snd_pcm_state(pcm)) {
|
||||||
|
case SND_PCM_STATE_PREPARED:
|
||||||
|
case SND_PCM_STATE_RUNNING:
|
||||||
|
/* these states require a call to snd_pcm_drain() */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SND_PCM_STATE_DRAINING:
|
||||||
|
/* already draining, but not yet finished; this is
|
||||||
|
probably a spurious epoll event, and we should wait
|
||||||
|
for the next one */
|
||||||
|
return false;
|
||||||
|
|
||||||
|
default:
|
||||||
|
/* all other states cannot be drained, and we're
|
||||||
|
done */
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/* .. and finally drain the ALSA hardware buffer */
|
/* .. and finally drain the ALSA hardware buffer */
|
||||||
|
|
||||||
int result;
|
int result;
|
||||||
|
Loading…
Reference in New Issue
Block a user