# HG changeset patch
# User uau
# Date 1190670598 0
# Node ID 2c238fa777ff372e909b6a65b2e5b7117f2fe980
# Parent  9118be6575da17de32a01765111f7b60efc1d062
ao_alsa: Fix get_space() return values larger than buffersize

After a buffer underrun the ALSA get_space() function sometimes returned
values larger than the ao had set in ao_data.buffersize. Fix this by
replacing the old check against MAX_OUTBURST by one against
ao_data.buffersize. There should be no need for the MAX_OUTBURST check;
the current MPlayer side should no longer have any constant limit on the
amount of data an ao can buffer or request at once.

The get_space() values larger than ao_data.buffersize triggered errors
in audio decoding causing the current attempt to fill audio buffers to
be aborted. I'm not sure how often that caused behavior noticeably worse
then an underrun already is.

diff -r 9118be6575da -r 2c238fa777ff libao2/ao_alsa.c
--- a/libao2/ao_alsa.c	Mon Sep 24 21:49:56 2007 +0000
+++ b/libao2/ao_alsa.c	Mon Sep 24 21:49:58 2007 +0000
@@ -861,8 +861,8 @@
     }
     
     ret = snd_pcm_status_get_avail(status) * bytes_per_sample;
-    if (ret > MAX_OUTBURST)
-	    ret = MAX_OUTBURST;
+    if (ret > ao_data.buffersize)  // Buffer underrun?
+	ret = ao_data.buffersize;
     return(ret);
 }