From abd5e8a2e774f20d78a901faac64fe74fdc7b040 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 28 Mar 2013 22:46:22 +0100 Subject: options: remove --af-adv Anything this option did has been removed in the preceding 3 commits. Note that even though these options sounded like a good idea (like setting accuracy vs. speed tradeoffs), they were not really properly implemented. --- DOCS/man/en/options.rst | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) (limited to 'DOCS/man/en/options.rst') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index fab682fdd5..5c71dd977a 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -44,40 +44,6 @@ ``--af-clr`` exist to modify a previously specified list, but you shouldn't need these for typical use. ---af-adv= - See also ``--af``. - Specify advanced audio filter options: - - force=<0-7> - Forces the insertion of audio filters to one of the following: - - 0 - Use completely automatic filter insertion (currently identical to - 1). - 1 - Optimize for accuracy (default). - 2 - Optimize for speed. *Warning*: Some features in the audio filters - may silently fail, and the sound quality may drop. - 3 - Use no automatic insertion of filters and no optimization. - *Warning*: It may be possible to crash mpv using this setting. - 4 - Use automatic insertion of filters according to 0 above, but use - floating point processing when possible. - 5 - Use automatic insertion of filters according to 1 above, but use - floating point processing when possible. - 6 - Use automatic insertion of filters according to 2 above, but use - floating point processing when possible. - 7 - Use no automatic insertion of filters according to 3 above, and - use floating point processing when possible. - - list= - Same as ``--af``. - --aid= Select audio channel. ``auto`` selects the default, ``no`` disables audio. See also ``--alang``. @@ -1946,9 +1912,8 @@ --srate= Select the output sample rate to be used (of course sound cards have limits on this). If the sample frequency selected is different from that - of the current media, the resample or lavcresample audio filter will be - inserted into the audio filter layer to compensate for the difference. The - type of resampling can be controlled by the ``--af-adv`` option. + of the current media, the lavrresample audio filter will be + inserted into the audio filter layer to compensate for the difference. --start= Seek to given time position. -- cgit v1.2.3 From 071a8f50b96758ced05e1eef3aba5ce915a56479 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 31 Mar 2013 04:24:53 +0200 Subject: options: add option to prevent decoder audio downmixing Also rename --a52drc to --ad-lavc-ac3drc, and add --ad-lavc-o. --- DOCS/man/en/options.rst | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'DOCS/man/en/options.rst') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 5c71dd977a..03f09b2efc 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1,11 +1,3 @@ ---a52drc= - Select the Dynamic Range Compression level for AC-3 audio streams. - is a float value ranging from 0 to 1, where 0 means no compression and 1 - (which is the default) means full compression (make loud passages more - silent and vice versa). Values up to 2 are also accepted, but are purely - experimental. This option only shows an effect if the AC-3 stream contains - the required range compression information. - --abs= (``--ao=oss`` only) (OBSOLETE) Override audio driver/card buffer size detection. @@ -37,6 +29,25 @@ ``--ad=help`` List all available decoders. +--ad-lavc-ac3drc= + Select the Dynamic Range Compression level for AC-3 audio streams. + is a float value ranging from 0 to 1, where 0 means no compression and 1 + (which is the default) means full compression (make loud passages more + silent and vice versa). Values up to 2 are also accepted, but are purely + experimental. This option only shows an effect if the AC-3 stream contains + the required range compression information. + +--ad-lavc-downmix= + Whether to request audio channel downmixing from the decoder (default: yes). + Some decoders, like AC-3, AAC and DTS, can remix audio on decoding. The + requested number of output channels is set with the ``--channels`` option. + Useful for playing surround audio on a stereo system. + +--ad-lavc-o==[,=[,...]] + Pass AVOptions to libavcodec decoder. Note, a patch to make the o= + unneeded and pass all unknown options through the AVOption system is + welcome. A full list of AVOptions can be found in the FFmpeg manual. + --af= Specify a list of audio filters to apply to the audio stream. See `audio_filters` for details and descriptions of the available filters. -- cgit v1.2.3 From 9d1f5e8e9f16737b732918a8924c23ee70886db5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 9 May 2013 13:57:44 +0200 Subject: manpage: update --channels --- DOCS/man/en/options.rst | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'DOCS/man/en/options.rst') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 03f09b2efc..f528c3f849 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -357,25 +357,24 @@ --cdrom-device= Specify the CD-ROM device (default: ``/dev/cdrom``). ---channels= +--channels= Request the number of playback channels (default: 2). mpv asks the decoder to decode the audio into as many channels as specified. Then it is up to the decoder to fulfill the requirement. This is usually only - important when playing videos with AC-3 audio (like DVDs). In that case - liba52 does the decoding by default and correctly downmixes the audio into - the requested number of channels. To directly control the number of output - channels independently of how many channels are decoded, use the channels - filter (``--af=channels``). + important when playing videos with AC-3, AAC or DTS audio. In that case + libavcodec downmixes the audio into the requested number of channels if + possible. *NOTE*: This option is honored by codecs (AC-3 only), filters (surround) and audio output drivers (OSS at least). - Available options are: + The ``--channels`` option either takes a channel number or an explicit + channel layout. Channel numbers refer to default layouts, e.g. 2 channels + refer to stereo, 6 refers to 5.1. - :2: stereo - :4: surround - :6: full 5.1 - :8: full 7.1 + See ``--channels=help`` output for defined default layouts. This also + lists speaker names, which can be used to express arbitrary channel + layouts (e.g. ``fl-fr-lfe`` is 2.1). --chapter= Specify which chapter to start playing at. Optionally specify which -- cgit v1.2.3