summaryrefslogtreecommitdiffstats
path: root/DOCS/man
diff options
context:
space:
mode:
Diffstat (limited to 'DOCS/man')
-rw-r--r--DOCS/man/mpv.rst33
-rw-r--r--DOCS/man/vo.rst16
2 files changed, 48 insertions, 1 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index 0a993d412e..ca1e87105e 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -610,6 +610,39 @@ PROTOCOLS
``memory://data``
Use the ``data`` part as source data.
+PSEUDO GUI MODE
+===============
+
+mpv has no official GUI, other than the OSC (`ON SCREEN CONTROLLER`_), which
+is not a full GUI and is not meant to be. However, to compensate for the lack
+of expected GUI behavior, mpv will in some cases start with some settings
+changed to behave slightly more like a GUI mode.
+
+Currently this happens only in the following cases:
+
+- if started using the ``mpv.desktop`` file on Linux (e.g. started from menus
+ or file associations provided by desktop environments)
+- if started from explorer.exe on Windows (technically, if it was started on
+ Windows, and all of the stdout/stderr/stdin handles are unset)
+- manually adding ``--profile=pseudo-gui`` to the command line
+
+This mode implicitly adds ``--profile=pseudo-gui`` to the command line, with
+the ``pseudo-gui`` profile being predefined with the following contents:
+
+::
+
+ [pseudo-gui]
+ terminal=no
+ force-window=yes
+ idle=once
+
+This follows the mpv config file format. To customize pseudo-GUI mode, you can
+put your own ``pseudo-gui`` profile into your ``mpv.conf``. This profile will
+enhance the default profile, rather than overwrite it.
+
+The profile always overrides other settings in ``mpv.conf``.
+
+
.. include:: options.rst
.. include:: ao.rst
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 5d4bbe1c61..2447a8c455 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -548,6 +548,16 @@ Available video output drivers are:
X11/GLX only.
+ ``dwmflush``
+ Calls ``DwmFlush`` after swapping buffers on Windows (default: 0).
+ It also sets ``SwapInterval(0)`` to ignore the OpenGL timing. Values
+ are: 0 (disabled), 1 (only in windowed mode), 2 (also in full screen).
+ This may help getting more consistent frame intervals, especially with
+ high-fps clips - which might also reduce dropped frames. Typically a
+ value of 1 should be enough since full screen may bypass the DWM.
+
+ Windows only.
+
``sw``
Continue even if a software renderer is detected.
@@ -682,7 +692,7 @@ Available video output drivers are:
Default is 128x256x64.
Sizes must be a power of two, and 512 at most.
- ``blend-subtitles``
+ ``blend-subtitles=<yes|video|no>``
Blend subtitles directly onto upscaled video frames, before
interpolation and/or color management (default: no). Enabling this
causes subtitles to be affected by ``icc-profile``, ``target-prim``,
@@ -693,6 +703,10 @@ Available video output drivers are:
visible portion of the video, so you can't have subtitles exist in the
black margins below a video (for example).
+ If ``video`` is selected, the behavior is similar to ``yes``, but subs
+ are drawn at the video's native resolution, and scaled along with the
+ video.
+
.. warning:: This changes the way subtitle colors are handled. Normally,
subtitle colors are assumed to be in sRGB and color managed
as such. Enabling this makes them treated as being in the