mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: Skip resume PCM if hardware doesn't support it

Browse source 
Hardwares without SNDRV_PCM_INFO_RESUME capability, like USB Audio,
don't support snd_pcm_resume() when it's in suspended state.

Let's use snd_pcm_hw_params_can_resume() to check hardware's capability
before snd_pcm_resume() attempt. If it doesn't support resume, just go
to snd_pcm_drop() to leave suspended state directly.
This commit is contained in:
Kai-Heng Feng 2019-12-10 16:16:18 +08:00
parent 464828faf2
commit 734a00c849
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/alsa/alsa-util.c
View file

@ -1066,6 +1066,7 @@ void pa_alsa_init_proplist_ctl(pa_proplist *p, const char *name) {
int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents) { int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents) {
snd_pcm_state_t state; snd_pcm_state_t state;
snd_pcm_hw_params_t *hwparams;
int err; int err;
pa_assert(pcm); pa_assert(pcm);
@ -1103,6 +1104,14 @@ int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents) {
break; break;
case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_SUSPENDED:
snd_pcm_hw_params_alloca(&hwparams);
if ((err = snd_pcm_hw_params_any(pcm, hwparams)) < 0) {
pa_log_debug("snd_pcm_hw_params_any() failed: %s", pa_alsa_strerror(err));
return -1;
}
if (snd_pcm_hw_params_can_resume(hwparams)) {
/* Retry resume 3 times before giving up, then fallback to restarting the stream. */ /* Retry resume 3 times before giving up, then fallback to restarting the stream. */
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
if ((err = snd_pcm_resume(pcm)) == 0) if ((err = snd_pcm_resume(pcm)) == 0)
@ -1112,6 +1121,7 @@ int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents) {
pa_msleep(25); pa_msleep(25);
} }
pa_log_warn("Could not recover alsa device from SUSPENDED state, trying to restart PCM"); pa_log_warn("Could not recover alsa device from SUSPENDED state, trying to restart PCM");
}
/* Fall through */ /* Fall through */
default: default: