[vlc-commits] PulseAudio: buffer metrics are buffer metrics not overall metrics

[Rémi Denis-Courmont]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jul 16 19:56:48 2011 +0300| [73700b78e4a319872af7047fdb44f5413e019d6c] | committer: Rémi Denis-Courmont

PulseAudio: buffer metrics are buffer metrics not overall metrics

This should fix buffer underflows in most cases.
(cherry picked from commit 01d9caa19dcca42211d9763517b77b28857ca07f)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=73700b78e4a319872af7047fdb44f5413e019d6c
---

 modules/audio_output/pulse.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 64de04d..2dae2bb 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -383,15 +383,13 @@ static int Open(vlc_object_t *obj)
 
     const pa_stream_flags_t flags = PA_STREAM_INTERPOLATE_TIMING
                                   | PA_STREAM_AUTO_TIMING_UPDATE
-                                  | PA_STREAM_ADJUST_LATENCY
                                   | PA_STREAM_START_CORKED;
 
     const uint32_t byterate = pa_bytes_per_second(&ss);
     struct pa_buffer_attr attr;
-    /* no point in larger buffers on PA side than VLC */
     attr.maxlength = -1;
-    attr.tlength = byterate * AOUT_MAX_ADVANCE_TIME / CLOCK_FREQ;
-    attr.prebuf = byterate * AOUT_MAX_PREPARE_TIME / CLOCK_FREQ;
+    attr.tlength = byterate * AOUT_MAX_PREPARE_TIME / CLOCK_FREQ;
+    attr.prebuf = -1;
     attr.minreq = -1;
     attr.fragsize = 0; /* not used for output */