From 35cc1830a3ead5657606f1bb22ce35a7bd6be50c Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 7 Jan 2015 22:23:38 +0100 Subject: ao_pulse: disable latency calculation hacks by default This used to be required to workaround PulseAudio bugs. Even later, when the bugs were (partially?) fixed in PulseAudio, I had the feeling the hacks gave better behavior. On the other hand, I couldn't actually reproduce any bad behavior without the hacks lately. On top of this, it seems our hacks sometimes perform much worse than PulseAudio's native implementation (see #1430). So disable the hacks by default, but still leave the code and the option in case it still helps somewhere. Also, being able to blame PulseAudio's code by using its native API is much easier than trying to debug our own (mplayer2-derived) hacks. --- DOCS/man/ao.rst | 9 +++++++-- audio/out/ao_pulse.c | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DOCS/man/ao.rst b/DOCS/man/ao.rst index 26ecc2a328..65980afc2d 100644 --- a/DOCS/man/ao.rst +++ b/DOCS/man/ao.rst @@ -147,10 +147,15 @@ Available audio output drivers are: changes. Default: 250. ``latency-hacks=`` - Enable hacks to workaround PulseAudio timing bugs (default: yes). If + Enable hacks to workaround PulseAudio timing bugs (default: no). If enabled, mpv will do elaborate latency calculations on its own. If disabled, it will use PulseAudio automatically updated timing - information. Disabling this might help with e.g. networked audio. + information. Disabling this might help with e.g. networked audio or + some plugins, while enabling it might help in some unknown situations + (it used to be required to get good behavior on old PulseAudio versions). + + If you have stuttering video when using pulse, try to enable this + option. (Or alternatively, try to update PulseAudio.) ``portaudio`` PortAudio audio output driver. This works on all platforms, and has diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c index 8f60d91c87..d96b9fb98d 100644 --- a/audio/out/ao_pulse.c +++ b/audio/out/ao_pulse.c @@ -786,7 +786,6 @@ const struct ao_driver audio_out_pulse = { .priv_size = sizeof(struct priv), .priv_defaults = &(const struct priv) { .cfg_buffer = 250, - .cfg_latency_hacks = 1, }, .options = (const struct m_option[]) { OPT_STRING("host", cfg_host, 0), -- cgit v1.2.3