diff options
Diffstat (limited to 'DOCS')
-rw-r--r-- | DOCS/interface-changes.rst | 9 | ||||
-rw-r--r-- | DOCS/man/input.rst | 5 | ||||
-rw-r--r-- | DOCS/man/options.rst | 55 |
3 files changed, 37 insertions, 32 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 494b769b8b..312fe9552a 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -48,6 +48,15 @@ Interface changes - remove deprecated --demuxer-max-packets - remove most of the deprecated audio and video filters - remove the deprecated --balance option/property + - rename the --opengl-hwdec-interop option to --gpu-hwdec-interop, and + change some of its semantics: extend it take the strings "auto" and + "all". "all" loads all backends. "auto" behaves like "all" for + vo_opengl_cb, while on vo_gpu it loads nothing, but allows on demand + loading by the decoder. The empty string as option value behaves like + "auto". Old --hwdec values do not work anymore. + This option is hereby declared as unstable and may change any time - its + old use is deprecated, and it has very little use outside of debugging + now. --- mpv 0.27.0 --- - drop previously deprecated --field-dominance option - drop previously deprecated "osd" command diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index 75cb9526c6..4e81a3ce2d 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -1433,7 +1433,7 @@ Property list This is known only once the VO has opened (and possibly later). With some VOs (like ``opengl``), this might be never known in advance, but only when the decoder attempted to create the hw decoder successfully. (Using - ``--opengl-hwdec-interop`` can load it eagerly.) If there are multiple + ``--gpu-hwdec-interop`` can load it eagerly.) If there are multiple drivers loaded, they will be separated by ``,``. If no VO is active or no interop driver is known, this property is @@ -1443,9 +1443,6 @@ Property list multiple interop drivers for the same hardware decoder, depending on platform and VO. - This is somewhat similar to the ``--opengl-hwdec-interop`` option, but - it returns the actually loaded backend, not the value of this option. - ``video-format`` Video format as string. diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index f3564cffb6..f01d40e563 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -816,34 +816,33 @@ Video frame glitches or discoloration, and you have ``--hwdec`` turned on, the first thing you should try is disabling it. -``--opengl-hwdec-interop=<name>`` - This is useful for the ``gpu`` and ``opengl-cb`` VOs for creating the - hardware decoding OpenGL interop context, but without actually enabling - hardware decoding itself (like ``--hwdec`` does). - - If set to an empty string (default), the ``--hwdec`` option is used. - - For ``gpu``, if set, do not create the interop context on demand, but - when the VO is created. - - For ``opengl-cb``, if set, load the interop context as soon as the OpenGL - context is created. Since ``opengl-cb`` has no on-demand loading, this - allows enabling hardware decoding at runtime at all, without having - to temporarily set the ``hwdec`` option just during OpenGL context - initialization with ``mpv_opengl_cb_init_gl()``. - - See ``--opengl-hwdec-interop=help`` for accepted values. This lists the - interop backend, with the ``--hwdec`` alias after it in ``[...]``. Consider - all values except the proper interop backend name, ``auto``, and ``no`` as - silently deprecated and subject to change. Also, if you use this in - application code (e.g. via libmpv), any value other than ``auto`` and ``no`` - should be avoided, as backends can change. - - Currently the option sets a single value. It is possible that the option - type changes to a list in the future. - - The old alias ``--hwdec-preload`` has different behavior if the option value - is ``no``. +``--gpu-hwdec-interop=<auto|all|no|name>`` + This option is for troubleshooting hwdec interop issues. Since it's a + debugging option, its semantics may change at any time. + + This is useful for the ``gpu`` and ``opengl-cb`` VOs for selecting which + hwdec interop context to use exactly. Effectively it also can be used + to block loading of certain backends. + + If set to ``auto`` (default), the behavior depends on the VO: for ``gpu``, + it does nothing, and the interop context is loaded on demand (when the + decoder probes for ``--hwdec`` support). For ``opengl-cb``, which has + has no on-demand loading, this is equivalent to ``all``. + + The empty string is equivalent to ``auto``. + + If set to ``all``, it attempts to load all interop contexts at GL context + creation time. + + Other than that, a specific backend can be set, and the list of them can + be queried with ``help`` (mpv CLI only). + + Runtime changes to this are ignored (the current option value is used + whenever the renderer is created). + + The old aliases ``--opengl-hwdec-interop`` and ``--hwdec-preload`` are + barely related to this anymore, but will be somewhat compatible in some + cases. ``--hwdec-image-format=<name>`` Set the internal pixel format used by hardware decoding via ``--hwdec`` |