summaryrefslogtreecommitdiffstats
path: root/src/modules/alsa/alsa-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-02-24 06:06:04 +0100
committerLennart Poettering <lennart@poettering.net>2009-02-24 06:06:04 +0100
commitec9f8f10f358ededa1dec0e3f7f57669fce58547 (patch)
tree544b14f7a99cc3bc4ac971e5263b18bbe3befaf6 /src/modules/alsa/alsa-util.c
parent9eb50701b6a6e8e5b74236bc954e94097eb7e680 (diff)
if ALSA gives us nonsensical data at least try to fix it up a little
Diffstat (limited to 'src/modules/alsa/alsa-util.c')
-rw-r--r--src/modules/alsa/alsa-util.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index 8eedeeb5..30d57e09 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -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);
- if (k >= hwbuf_size * 3 ||
- k >= pa_bytes_per_second(ss)*10)
+ if (k >= hwbuf_size * 5 ||
+ k >= pa_bytes_per_second(ss)*10) {
PA_ONCE_BEGIN {
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_ONCE_END;
+ /* Mhmm, let's try not to fail completely */
+ n = (snd_pcm_sframes_t) (hwbuf_size / pa_frame_size(ss));
+ }
+
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;
- if (abs_k >= hwbuf_size * 3 ||
- abs_k >= pa_bytes_per_second(ss)*10)
+ if (abs_k >= hwbuf_size * 5 ||
+ abs_k >= pa_bytes_per_second(ss)*10) {
PA_ONCE_BEGIN {
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_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;
}