diff options
Diffstat (limited to 'DOCS/man')
| -rw-r--r-- | DOCS/man/console.rst | 2 | ||||
| -rw-r--r-- | DOCS/man/input.rst | 40 | ||||
| -rw-r--r-- | DOCS/man/mpv.rst | 2 | ||||
| -rw-r--r-- | DOCS/man/osc.rst | 19 | ||||
| -rw-r--r-- | DOCS/man/stats.rst | 2 | ||||
| -rw-r--r-- | DOCS/man/vf.rst | 18 |
6 files changed, 44 insertions, 39 deletions
diff --git a/DOCS/man/console.rst b/DOCS/man/console.rst index b9f169f1cc..69cc103c15 100644 --- a/DOCS/man/console.rst +++ b/DOCS/man/console.rst @@ -123,7 +123,7 @@ Configuration This script can be customized through a config file ``script-opts/console.conf`` placed in mpv's user directory and through the ``--script-opts`` command-line -option. The configuration syntax is described in `ON SCREEN CONTROLLER`_. +option. The configuration syntax is described in `mp.options functions`_. Key bindings can be changed in a standard way, see for example stats.lua documentation. diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index f9fa59121d..1a6fa7de13 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -2522,7 +2522,7 @@ Property list Display aspect ratio as float. ``video-params/aspect-name`` - Display aspect ratio name as string. The name coresponds to motion + Display aspect ratio name as string. The name corresponds to motion picture film format that introduced given aspect ratio in film. ``video-params/par`` @@ -2711,11 +2711,11 @@ Property list are the GDI names (\\.\DISPLAY1, \\.\DISPLAY2, etc.) and the first display in the list will be the one that Windows considers associated with the window (as determined by the MonitorFromWindow API.) On macOS these are the - Display Product Names as used in the System Information and only one display - name is returned since a window can only be on one screen. On Wayland, these - are the wl_output names if protocol version >= 4 is used - (LVDS-1, HDMI-A-1, X11-1, etc.), or the wl_output model reported by the - geometry event if protocol version < 4 is used. + Display Product Names as used in the System Information with a serial number + in brackets and only one display name is returned since a window can only be + on one screen. On Wayland, these are the wl_output names if protocol + version >= 4 is used (LVDS-1, HDMI-A-1, X11-1, etc.), or the wl_output model + reported by the geometry event if protocol version < 4 is used. ``display-fps`` The refresh rate of the current display. Currently, this is the lowest FPS @@ -2823,19 +2823,27 @@ Property list stripped. If the subtitle is not text-based (i.e. DVD/BD subtitles), an empty string is returned. -``sub-text-ass`` - Like ``sub-text``, but return the text in ASS format. Text subtitles in - other formats are converted. For native ASS subtitles, events that do - not contain any text (but vector drawings etc.) are not filtered out. If - multiple events match with the current playback time, they are concatenated - with line breaks. Contains only the "Text" part of the events. + This has sub-properties for different formats: - This property is not enough to render ASS subtitles correctly, because ASS - header and per-event metadata are not returned. You likely need to do - further filtering on the returned string to make it useful. + ``sub-text/ass`` + Like ``sub-text``, but return the text in ASS format. Text subtitles in + other formats are converted. For native ASS subtitles, events that do + not contain any text (but vector drawings etc.) are not filtered out. If + multiple events match with the current playback time, they are concatenated + with line breaks. Contains only the "Text" part of the events. + + This property is not enough to render ASS subtitles correctly, because ASS + header and per-event metadata are not returned. Use ``/ass-full`` for that. + + ``sub-text/ass-full`` + Like ``sub-text-ass``, but return the full event with all fields, formatted as + lines in a .ass text file. Use with ``sub-ass-extradata`` for style information. + +``sub-text-ass`` (deprecated) + Deprecated alias for ``sub-text/ass``. ``secondary-sub-text`` - Same as ``sub-text``, but for the secondary subtitles. + Same as ``sub-text`` (with the same sub-properties), but for the secondary subtitles. ``sub-start`` The current subtitle start time (in seconds). If there's multiple current diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst index b0f407e874..579f1b313f 100644 --- a/DOCS/man/mpv.rst +++ b/DOCS/man/mpv.rst @@ -1698,5 +1698,5 @@ FILES ON MACOS On macOS the watch later directory is located at ``~/.config/mpv/watch_later/`` and the cache directory is set to ``~/Library/Caches/io.mpv/``. These directories -can't be overwritten by enviroment variables. +can't be overwritten by environment variables. Everything else is the same as `FILES`_. diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst index 731485a662..97b4f4818e 100644 --- a/DOCS/man/osc.rst +++ b/DOCS/man/osc.rst @@ -130,22 +130,9 @@ del Cycles visibility between never / auto (mouse-move) / always Configuration ------------- -The OSC offers limited configuration through a config file -``script-opts/osc.conf`` placed in mpv's user dir and through the -``--script-opts`` command-line option. Options provided through the command-line -will override those from the config file. - -Config Syntax -~~~~~~~~~~~~~ - -The config file must exactly follow the following syntax:: - - # this is a comment - optionA=value1 - optionB=value2 - -``#`` can only be used at the beginning of a line and there may be no -spaces around the ``=`` or anywhere else. +This script can be customized through a config file ``script-opts/osc.conf`` +placed in mpv's user directory and through the ``--script-opts`` command-line +option. The configuration syntax is described in `mp.options functions`_. Command-line Syntax ~~~~~~~~~~~~~~~~~~~ diff --git a/DOCS/man/stats.rst b/DOCS/man/stats.rst index bc8f04f1a8..8bc0a3c651 100644 --- a/DOCS/man/stats.rst +++ b/DOCS/man/stats.rst @@ -43,7 +43,7 @@ Configuration This script can be customized through a config file ``script-opts/stats.conf`` placed in mpv's user directory and through the ``--script-opts`` command-line -option. The configuration syntax is described in `ON SCREEN CONTROLLER`_. +option. The configuration syntax is described in `mp.options functions`_. Configurable Options ~~~~~~~~~~~~~~~~~~~~ diff --git a/DOCS/man/vf.rst b/DOCS/man/vf.rst index 59175e79ef..a989ad5445 100644 --- a/DOCS/man/vf.rst +++ b/DOCS/man/vf.rst @@ -585,7 +585,7 @@ Available mpv-only filters are: ``display_res`` Resolution of the current display. This is an integer array with the - first entry corresponding to the width and the second entry coresponding + first entry corresponding to the width and the second entry corresponding to the height. These values can be 0. Note that this will not respond to monitor changes and may not work on all platforms. @@ -765,12 +765,22 @@ Available mpv-only filters are: read information from this filter instead. ``gpu=...`` - Convert video to RGB using the OpenGL renderer normally used with - ``--vo=gpu``. This requires that the EGL implementation supports off-screen - rendering on the default display. (This is the case with Mesa.) + Convert video to RGB using the Vulkan or OpenGL renderer normally used with + ``--vo=gpu``. In case of OpenGL, this requires that the EGL implementation + supports off-screen rendering on the default display. (This is the case with + Mesa.) Sub-options: + ``api=<type>`` + The value ``type`` selects the rendering API. You can also pass + ``help`` to get a complete list of compiled in backends. + + egl + EGL (default if available) + vulkan + Vulkan + ``w=<pixels>``, ``h=<pixels>`` Size of the output in pixels (default: 0). If not positive, this will use the size of the first filtered input frame. |