mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

if ALSA gives us nonsensical data at least try to fix it up a little

Browse source
This commit is contained in:
Lennart Poettering 2009-02-24 06:06:04 +01:00
parent 9eb50701b6
commit ec9f8f10f3
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1574,8 +1574,8 @@ snd_pcm_sframes_t pa_alsa_safe_avail(snd_pcm_t *pcm, size_t hwbuf_size, const pa
k = (size_t) n * pa_frame_size(ss); k = (size_t) n * pa_frame_size(ss);
if (k >= hwbuf_size * 3 || if (k >= hwbuf_size * 5 ||
k >= pa_bytes_per_second(ss)*10) k >= pa_bytes_per_second(ss)*10) {
PA_ONCE_BEGIN { PA_ONCE_BEGIN {
char *dn = pa_alsa_get_driver_name_by_pcm(pcm); char *dn = pa_alsa_get_driver_name_by_pcm(pcm);
@ -1587,6 +1587,10 @@ snd_pcm_sframes_t pa_alsa_safe_avail(snd_pcm_t *pcm, size_t hwbuf_size, const pa
pa_xfree(dn); pa_xfree(dn);
} PA_ONCE_END; } PA_ONCE_END;
/* Mhmm, let's try not to fail completely */
n = (snd_pcm_sframes_t) (hwbuf_size / pa_frame_size(ss));
}
return n; return n;
} }
@ -1610,8 +1614,8 @@ int pa_alsa_safe_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delay, size_t hwbuf_si
abs_k = k >= 0 ? (size_t) k : (size_t) -k; abs_k = k >= 0 ? (size_t) k : (size_t) -k;
if (abs_k >= hwbuf_size * 3 || if (abs_k >= hwbuf_size * 5 ||
abs_k >= pa_bytes_per_second(ss)*10) abs_k >= pa_bytes_per_second(ss)*10) {
PA_ONCE_BEGIN { PA_ONCE_BEGIN {
char *dn = pa_alsa_get_driver_name_by_pcm(pcm); char *dn = pa_alsa_get_driver_name_by_pcm(pcm);
@ -1624,6 +1628,13 @@ int pa_alsa_safe_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delay, size_t hwbuf_si
pa_xfree(dn); pa_xfree(dn);
} PA_ONCE_END; } PA_ONCE_END;
/* Mhmm, let's try not to fail completely */
if (k < 0)
*delay = -(snd_pcm_sframes_t) (hwbuf_size / pa_frame_size(ss));
else
*delay = (snd_pcm_sframes_t) (hwbuf_size / pa_frame_size(ss));
}
return 0; return 0;
} }