summaryrefslogtreecommitdiffstats
path: root/DOCS/man/en/options.rst
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-18 21:41:22 +0200
committerwm4 <wm4@nowhere>2012-09-23 14:57:01 +0200
commit425ac31a3b07cbef79891d01a3655b9c6d7efa32 (patch)
tree840de031a7a68d781fcc5d4df8f70061e12abc29 /DOCS/man/en/options.rst
parentc57883b71b959d7d5c1c1bade8b4234017c11d1e (diff)
downloadmpv-425ac31a3b07cbef79891d01a3655b9c6d7efa32.tar.bz2
mpv-425ac31a3b07cbef79891d01a3655b9c6d7efa32.tar.xz
softvol, ao_pulse: prefer ao_pulse volume control by default
--softvol is enabled by default. For most audio outputs, this is a good thing, as they have either their own (bad) soft volume implementation, or control the system mixer. With ao_pulse, the situation is a bit different: it supports per-application volume (i.e. volume control is not really global). More importantly, ao_pulse uses a rather large audio buffer, and changing the volume with mplayer's volume filter has a large delay. With the native ao_pulse volume control, it's instant, because PulseAudio's audio filtering happens at a later stage in its processing pipeline (inaccessible for mplayer). This means native volume control should really be allowed for ao_pulse, while it's the reverse for other audio outputs. Make --softvol a choice option, and add a new "auto" choice. This is default and will use PA's volume control with ao_pulse, and mplayer's volume filter otherwise (i.e. the old softvol behavior).
Diffstat (limited to 'DOCS/man/en/options.rst')
-rw-r--r--DOCS/man/en/options.rst16
1 files changed, 13 insertions, 3 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 431ff1a7de..653cac9737 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1741,9 +1741,19 @@
timing is imprecise and you cannot use the RTC either. Comes at the
price of higher CPU consumption.
---no-softvol
- Try to use the sound card mixer (if available), instead of using the volume
- audio filter.
+--softvol=<mode>
+ Control whether to use the volume controls of the audio output driver, or
+ the internal mplayer volume filter.
+
+ :no: prefer audio driver controls, use the volume filter only if
+ absolutely needed
+ :yes: always use the volume filter
+ :auto: prefer the volume filter if the audio driver uses the system mixer (default)
+
+ The intention with ``auto`` is to avoid changing system mixer settings with
+ default settings. mplayer is a video player, not a mixer panel. On the other
+ hand, mixer controls should be used for sound servers like PulseAudio, which
+ provide per-application volume.
--softvol-max=<10.0-10000.0>
Set the maximum amplification level in percent (default: 200). A value of