From 382bafcb1349855c2871bbe0a813f8493e1bd9f7 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 18 Apr 2016 21:32:58 +0200
Subject: player: loop on end of file if ab-loop-b is unset

Possibly slightly more useful/intuitive.
---
 DOCS/man/input.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index 241f6740fb..52ace4aada 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -1081,8 +1081,9 @@ Property list
                 "default"           MPV_FORMAT_FLAG
 
 ``ab-loop-a``, ``ab-loop-b`` (RW)
-    Set/get A-B loop points. See corresponding options and ``ab_loop`` command.
-    The special value ``no`` on either of these properties disables looping.
+    Set/get A-B loop points. See corresponding options and ``ab-loop`` command.
+    The special value ``no`` on ``ab-loop-a`` disables looping, while setting
+    ``ab-loop-b`` to ``no`` loops when the end of the file is reached.
 
 ``angle`` (RW)
     Current DVD angle.
-- 
cgit v1.2.3


From 60664bc00b8ba18c514e9194399aa753e795fdd7 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 20 Apr 2016 18:00:20 +0200
Subject: stream_memory: add hex:// protocol

Completely useless, expect for some special purposes.
---
 DOCS/man/mpv.rst | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'DOCS/man')

diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index ea0681c5ae..bdde369672 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -715,6 +715,9 @@ PROTOCOLS
 ``memory://data``
     Use the ``data`` part as source data.
 
+``hex://data``
+    Like ``memory://``, but the string is interpreted as hexdump.
+
 PSEUDO GUI MODE
 ===============
 
-- 
cgit v1.2.3


From 1944a34c230b6afb7707fe4fb5eb0c613b96db9b Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 21 Apr 2016 22:15:17 +0200
Subject: command: if only ab-loop-b is set, loop from start of file

Commit 382bafcb changed the behavior for ab-loop-a. This commit changes
ab-loop-b so that the behavior is symmetric.

Adjust the OSD rendering accordingly to the two changes.

Also fix mentions of the "ab_loop" command to the now preferred
"ab-loop".
---
 DOCS/man/input.rst   | 5 ++---
 DOCS/man/options.rst | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index 52ace4aada..83fddcf968 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -1081,9 +1081,8 @@ Property list
                 "default"           MPV_FORMAT_FLAG
 
 ``ab-loop-a``, ``ab-loop-b`` (RW)
-    Set/get A-B loop points. See corresponding options and ``ab-loop`` command.
-    The special value ``no`` on ``ab-loop-a`` disables looping, while setting
-    ``ab-loop-b`` to ``no`` loops when the end of the file is reached.
+    Set/get A-B loop points. See corresponding options and ``ab-loop`` command
+    for details.
 
 ``angle`` (RW)
     Current DVD angle.
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 18ac7fd2f0..2bd76fa800 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -261,8 +261,13 @@ Playback Control
 ``--ab-loop-a=<time>``, ``--ab-loop-b=<time>``
     Set loop points. If playback passes the ``b`` timestamp, it will seek to
     the ``a`` timestamp. Seeking past the ``b`` point doesn't loop (this is
-    intentional). The loop-points can be adjusted at runtime with the
-    corresponding properties. See also ``ab_loop`` command.
+    intentional).
+
+    If both options are set to ``no``, looping is disabled. Otherwise, the
+    start/end of the file is used if one of the options is set to ``no``.
+
+    The loop-points can be adjusted at runtime with the corresponding
+    properties. See also ``ab-loop`` command.
 
 ``--ordered-chapters``, ``--no-ordered-chapters``
     Enabled by default.
-- 
cgit v1.2.3


From 649e155938482ec75223d434a0aba2f1bf76f154 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 24 Apr 2016 17:58:39 +0200
Subject: manpage: fix --autofit example

Fixes #3069.
---
 DOCS/man/options.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 2bd76fa800..c96c10efbb 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1890,7 +1890,7 @@ Window
             Make the window width 70% of the screen size, keeping aspect ratio.
         ``1000``
             Set the window width to 1000 pixels, keeping aspect ratio.
-        ``70%:60%``
+        ``70%x60%``
             Make the window as large as possible, without being wider than 70%
             of the screen width, or higher than 60% of the screen height.
 
-- 
cgit v1.2.3


From 3706918311ef4cc57b1241e87dcc43d699e960f9 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 27 Apr 2016 13:49:47 +0200
Subject: vo_opengl: D3D11VA + ANGLE interop

This uses ID3D11VideoProcessor to convert the video to a RGBA surface,
which is then bound to ANGLE. Currently ANGLE does not provide any way
to bind nv12 surfaces directly, so this will have to do.

ID3D11VideoContext1 would give us slightly more control about the
colorspace conversion, though it's still not good, and not available
in MinGW headers yet.

The video processor is created lazily, because we need to have the coded
frame size, of which AVFrame and mp_image have no concept of. Doing the
creation lazily is less of a pain than somehow hacking the coded frame
size into mp_image.

I'm not really sure how ID3D11VideoProcessorInputView is supposed to
work. We recreate it on every frame, which is simple and hopefully
doesn't affect performance.
---
 DOCS/man/options.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index c96c10efbb..f7f92caabf 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -588,6 +588,7 @@ Video
     :dxva2: requires ``--vo=opengl:backend=angle`` or
         ``--vo=opengl:backend=dxinterop`` (Windows only)
     :dxva2-copy: copies video back to system RAM (Windows only)
+    :d3d11va: experimental, requires ``--vo=opengl:backend=angle`` (Windows only)
     :d3d11va-copy: experimental (Windows only)
     :rpi:       requires ``--vo=rpi`` (Raspberry Pi only - default if available)
 
-- 
cgit v1.2.3


From 9d16837c99c91e786e517b2520afa79bcdc433b3 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 27 Apr 2016 19:14:10 +0200
Subject: vo_opengl: support GL_EXT_texture_norm16 on GLES

This gives us 16 bit fixed-point integer texture formats, including
ability to sample from them with linear filtering, and using them as FBO
attachments.

The integer texture format path is still there for the sake of ANGLE,
which does not support GL_EXT_texture_norm16 yet.

The change to pass_dither() is needed, because the code path using
GL_R16 for the dither texture relies on glTexImage2D being able to
convert from GL_FLOAT to GL_R16. GLES does not allow this. This could be
trivially fixed by doing the conversion ourselves, but I'm too lazy to
do this now.
---
 DOCS/man/vo.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 18e3f4ae64..bf3fb2e8fd 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -838,7 +838,8 @@ Available video output drivers are:
         ``fmt`` can be one of: rgb, rgba, rgb8, rgb10, rgb10_a2, rgb16, rgb16f,
         rgb32f, rgba12, rgba16, rgba16f, rgba32f.
         Default: ``auto``, which maps to rgba16 on desktop GL, and rgba16f or
-        rgb10_a2 on GLES (e.g. ANGLE).
+        rgb10_a2 on GLES (e.g. ANGLE), unless GL_EXT_texture_norm16 is
+        available.
 
     ``gamma=<0.1..2.0>``
         Set a gamma value (default: 1.0). If gamma is adjusted in other ways
-- 
cgit v1.2.3


From 3a8058658d3c0fadc607460d0411bbdea55a8edb Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 30 Apr 2016 14:25:23 +0200
Subject: sd_add: replace --sub-ass=no with --ass-style-override=strip

--sub-ass=no / --ass=no still work, but --ass-style-override=strip is
preferred now. With this change, --ass-style-override can control all
the types of style overriding.
---
 DOCS/man/options.rst | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index f7f92caabf..bb92133396 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1429,7 +1429,7 @@ Subtitles
 
         Using this option may lead to incorrect subtitle rendering.
 
-``--ass-style-override=<yes|no|force>``
+``--ass-style-override=<yes|no|force|signfs|strip>``
     Control whether user style overrides should be applied.
 
     :yes:   Apply all the ``--ass-*`` style override options. Changing the default
@@ -1439,6 +1439,8 @@ Subtitles
     :no:    Render subtitles as forced by subtitle scripts.
     :force: Try to force the font style as defined by the ``--sub-text-*``
             options. Can break rendering easily.
+    :strip: Radically strip all ASS tags and styles from the subtitle. This
+            is equivalent to the old ``--no-ass`` / ``--no-sub-ass`` options.
 
 ``--ass-force-margins``
     Enables placing toptitles and subtitles in black borders when they are
@@ -1535,6 +1537,13 @@ Subtitles
 ``--sub-ass``, ``--no-sub-ass``
     Render ASS subtitles natively (enabled by default).
 
+    .. note::
+
+        This has been deprecated by ``--ass-style-override=strip``. You also
+        may need ``--embeddedfonts=no`` to get the same behavior. Also,
+        using ``--ass-style-override=force`` should give better results
+        without breaking subtitles too much.
+
     If ``--no-sub-ass`` is specified, all tags and style declarations are
     stripped and ignored on display. The subtitle renderer uses the font style
     as specified by the ``--sub-text-`` options instead.
@@ -1545,10 +1554,6 @@ Subtitles
         rendering of ASS/SSA subtitles. It can sometimes be useful to forcibly
         override the styling of ASS subtitles, but should be avoided in general.
 
-    .. note::
-
-        Try using ``--ass-style-override=force`` instead.
-
 ``--sub-auto=<no|exact|fuzzy|all>``, ``--no-sub-auto``
     Load additional subtitle files matching the video filename. The parameter
     specifies how external subtitle files are matched. ``exact`` is enabled by
-- 
cgit v1.2.3


From 70f64f3ca97e333d6a9a874f574710c09f6979b2 Mon Sep 17 00:00:00 2001
From: maniak1349 <maniak1349@gmail.com>
Date: Tue, 26 Apr 2016 04:46:49 +0300
Subject: options: add --fit-border video option Flag that is set by default.
 Reseting it will result in mpv trying to fit client area with video instead
 of the whole window with border and decorations on the screen. Marked as
 (Windows only) for now until it's implemented on other platforms.

---
 DOCS/man/options.rst | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index bb92133396..7b7db9396d 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1805,6 +1805,12 @@ Window
     Play video with window border and decorations. Since this is on by
     default, use ``--no-border`` to disable the standard window decorations.
 
+``--fit-border``, ``--no-fit-border``
+    (Windows only) Fit the whole window with border and decorations on the
+    screen. Since this is on by default, use ``--no-fit-border`` to make mpv
+    try to only fit client area with video on the screen. This behavior only
+    applied to window/video with size exceeding size of the screen.
+
 ``--on-all-workspaces``
     (X11 only)
     Show the video window on all virtual desktops.
-- 
cgit v1.2.3


From 9fda504d18bb8363353c82642f0a84ad0c94dec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vaidas=20Kasc=C4=97nas?= <vaidas@kascenas.lt>
Date: Sat, 30 Apr 2016 13:20:29 +0300
Subject: manpage: fix typo

Signed-off-by: wm4 <wm4@nowhere>
---
 DOCS/man/options.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 7b7db9396d..b7c8042905 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -3541,7 +3541,7 @@ Miscellaneous
     frame dropping due to the audio "overshooting" and skipping multiple video
     frames before the sync logic can react.
 
-``--video-sync-adrop-size=<value``
+``--video-sync-adrop-size=<value>``
     For the ``--video-sync=display-adrop`` mode. This mode duplicates/drops
     audio data to keep audio in sync with video. To avoid audio artifacts on
     jitter (which would add/remove samples all the time), this is done in
-- 
cgit v1.2.3


From 9054460bbaec267f7c08bf8115f50aba830bdc70 Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@nand.wakku.to>
Date: Tue, 3 May 2016 21:58:03 +0200
Subject: lcms: improve black point handling (especially BT.1886)

First of all, black point compensation is now on by default. This is
really rather harmless and only improves the result (where "improvement"
means "less black clipping").

Second, this adds an option to limit the ICC profile's contrast, which
helps for untagged matrix profiles that are implicitly black scaled even
in colorimetric intent. (Note that this relies on BPC being enabled to
work properly, which is why the two changes are tied together)

Third, this uses the LittleCMS built in black point estimator instead of
relying on the presence of accurate A2B tables. This also checks tags
and does some amounts of noise elimination.

If the option is unspecified and the profile is missing black point
information, print a warning instructing the user to set the option, and
fall back to 1000 otherwise.
---
 DOCS/man/vo.rst | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'DOCS/man')

diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index bf3fb2e8fd..0e091591e2 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -951,6 +951,13 @@ Available video output drivers are:
         Default is 128x256x64.
         Sizes must be a power of two, and 512 at most.
 
+    ``icc-contrast=<0-100000>``
+        Specifies an upper limit on the target device's contrast ratio.
+        This is detected automatically from the profile if possible, but for
+        some profiles it might be missing, causing the contrast to be assumed
+        as infinite. As a result, video may appear darker than intended. This
+        only affects BT.1886 content. The default of 0 means no limit.
+
     ``blend-subtitles=<yes|video|no>``
         Blend subtitles directly onto upscaled video frames, before
         interpolation and/or color management (default: no). Enabling this
-- 
cgit v1.2.3


From 833375f88d0392cac49b30ee3a4704fbab58e814 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 4 May 2016 16:55:26 +0200
Subject: command: change some hwdec properties

Introduce hwdec-current and hwdec-interop properties.

Deprecate hwdec-detected, which never made a lot of sense, and which is
replaced by the new properties. hwdec-active also becomes useless, as
hwdec-current is a superset, so it's deprecated too (for now).
---
 DOCS/man/input.rst | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index 83fddcf968..ea9eb07715 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -1385,14 +1385,39 @@ Property list
     properties to see whether this was successful.
 
     Unlike in mpv 0.9.x and before, this does not return the currently active
-    hardware decoder.
+    hardware decoder. Since mpv 0.17.1, ``hwdec-current`` is available for
+    this purpose.
+
+``hwdec-current``
+    Return the current hardware decoding in use. If decoding is active, return
+    one of the values used by the ``hwdec`` option/property. ``no`` indicates
+    software decoding. If no decoder is loaded, the property is unavailable.
+
+``hwdec-interop``
+    This returns the currently loaded hardware decoding/output interop driver.
+    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
+    ``--hwdec-preload`` 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
+    unavailable.
+
+    This does not necessarily use the same values as ``hwdec``. There can be
+    multiple interop drivers for the same hardware decoder, depending on
+    platform and VO.
 
 ``hwdec-active``
+    Deprecated. To be removed in mpv 0.19.0. Use ``hwdec-current`` instead.
+
     Return ``yes`` or ``no``, depending on whether any type of hardware decoding
     is actually in use.
 
 ``hwdec-detected``
-    If software decoding is active, this returns the hardware decoder in use.
+    Deprecated. To be removed in mpv 0.19.0.
+
+    If hardware decoding is active, this returns the hardware decoder in use.
     Otherwise, it returns either ``no``, or if applicable, the currently loaded
     hardware decoding API. This is known only once the VO has opened (and
     possibly later). With some VOs (like ``opengl``), this is never known in
-- 
cgit v1.2.3


From eef271c8f491c8a1de4e5f2b505582e786fe3690 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 6 May 2016 10:15:33 +0200
Subject: manpage: minor fixes to --lavfi-complex

---
 DOCS/man/options.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index b7c8042905..7cd9b8d281 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -3614,7 +3614,7 @@ Miscellaneous
     - A label of the form ``aidN`` selects audio track N as input (e.g.
       ``aid1``).
     - A label of the form ``vidN`` selects video track N as input.
-    - A label named ``ao`` will be connected to the audio input.
+    - A label named ``ao`` will be connected to the audio output.
     - A label named ``vo`` will be connected to the video output.
 
     Each label can be used only once. If you want to use e.g. an audio stream
@@ -3651,4 +3651,5 @@ Miscellaneous
         - ``null:// --lavfi-complex='life [vo]'``
           Conways' Life Game.
 
-    See the FFmpeg libavfilter documentation for details on the filter.
+    See the FFmpeg libavfilter documentation for details on the available
+    filters.
-- 
cgit v1.2.3


From 7c5188c27eacf4e13238f3621e015518c87bce10 Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@nand.wakku.to>
Date: Fri, 6 May 2016 18:00:39 +0200
Subject: DOCS: update documentation related to color management

Some of this documentation was left woefully inaccurate as color
management in mpv evolved. This commit updates all of the wording and
adds notes and comments where appropriate.
---
 DOCS/man/vf.rst |  2 +-
 DOCS/man/vo.rst | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/vf.rst b/DOCS/man/vf.rst
index faca4114a9..46384eb20f 100644
--- a/DOCS/man/vf.rst
+++ b/DOCS/man/vf.rst
@@ -303,7 +303,7 @@ Available filters are:
        Available gamma functions are:
 
        :auto:         automatic selection (default)
-       :bt.1886:      ITU-R BT.1886 (approximation of BT.601/BT.709/BT.2020 curve)
+       :bt.1886:      ITU-R BT.1886 (EOTF corresponding to BT.601/BT.709/BT.2020)
        :srgb:         IEC 61966-2-4 (sRGB)
        :linear:       Linear light
        :gamma1.8:     Pure power curve (gamma 1.8)
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 0e091591e2..647dd8c1a4 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -855,6 +855,10 @@ Available video output drivers are:
         0.8
             Pitch black room
 
+        NOTE: Typical movie content (Blu-ray etc.) already contains a gamma
+        drop of about 0.8, so specifying it here as well will result in even
+        even darker image than intended!
+
     ``gamma-auto``
         Automatically corrects the gamma value depending on ambient lighting
         conditions (adding a gamma boost for dark rooms).
@@ -865,8 +869,9 @@ Available video output drivers are:
         NOTE: Only implemented on OS X.
 
     ``target-prim=<value>``
-        Specifies the primaries of the display. Video colors will be adapted
-        to this colorspace if necessary. Valid values are:
+        Specifies the primaries of the display. Video colors will be adapted to
+        this colorspace when ICC color management is not being used. Valid
+        values are:
 
         auto
             Disable any adaptation (default)
@@ -893,12 +898,13 @@ Available video output drivers are:
 
     ``target-trc=<value>``
         Specifies the transfer characteristics (gamma) of the display. Video
-        colors will be adjusted to this curve. Valid values are:
+        colors will be adjusted to this curve when ICC color management is
+        not being used. Valid values are:
 
         auto
             Disable any adaptation (default)
         bt.1886
-            ITU-R BT.1886 curve, without the brightness drop (approx. 1.961)
+            ITU-R BT.1886 curve (assuming infinite contrast)
         srgb
             IEC 61966-2-4 (sRGB)
         linear
@@ -913,7 +919,7 @@ Available video output drivers are:
             ProPhoto RGB (ROMM)
 
     ``icc-profile=<file>``
-        Load an ICC profile and use it to transform linear RGB to screen output.
+        Load an ICC profile and use it to transform video RGB to screen output.
         Needs LittleCMS 2 support compiled in. This option overrides the
         ``target-prim``, ``target-trc`` and ``icc-profile-auto`` options.
 
-- 
cgit v1.2.3


From 55846641eac86d55817be20eab00b8256a7e1c9a Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 6 May 2016 19:57:17 +0200
Subject: x11: add --x11-bypass-compositor=always

Also add missing documentation for fs-only, and correct the default.
---
 DOCS/man/options.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 7cd9b8d281..b3ec913dee 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2085,9 +2085,14 @@ Window
 
     This option might be removed in the future.
 
-``--x11-bypass-compositor=<yes|no>``
+``--x11-bypass-compositor=<yes|no|fs-only|always>``
     If set to ``yes``, then ask the compositor to unredirect the mpv window
-    (default: no). This uses the ``_NET_WM_BYPASS_COMPOSITOR`` hint.
+    (default: ``fs-only``). This uses the ``_NET_WM_BYPASS_COMPOSITOR`` hint.
+
+    ``fs-only`` asks the window manager to disable the compositor only in
+    fullscreen mode,
+
+    ``always`` asks the window manager to always enable the compositor.
 
 
 Disc Devices
-- 
cgit v1.2.3


From 062493fa7ea4e3a77e2e4cb9cd03f5c038c3d254 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 7 May 2016 12:14:56 +0200
Subject: x11: rename inappropriate --x11-bypass-compositor=never option

This obviously made no sense.
---
 DOCS/man/options.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index b3ec913dee..a12c1f2743 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2085,14 +2085,14 @@ Window
 
     This option might be removed in the future.
 
-``--x11-bypass-compositor=<yes|no|fs-only|always>``
+``--x11-bypass-compositor=<yes|no|fs-only|never>``
     If set to ``yes``, then ask the compositor to unredirect the mpv window
     (default: ``fs-only``). This uses the ``_NET_WM_BYPASS_COMPOSITOR`` hint.
 
     ``fs-only`` asks the window manager to disable the compositor only in
     fullscreen mode,
 
-    ``always`` asks the window manager to always enable the compositor.
+    ``never`` asks the window manager to never disable the compositor.
 
 
 Disc Devices
-- 
cgit v1.2.3


From 11406b92157fe593d012ed35e1e78e8a26bd0973 Mon Sep 17 00:00:00 2001
From: Rahul Kalkani <kalkanirb@gmail.com>
Date: Sat, 7 May 2016 12:37:57 +0530
Subject: manpage: change gnome-screensaver-command example

Correct options to deactivate is -d or --deactivate.

Signed-off-by: wm4 <wm4@nowhere>
---
 DOCS/man/options.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index a12c1f2743..f3f0002e6f 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1989,7 +1989,7 @@ Window
 
     .. admonition:: Example for GNOME screensaver
 
-        ``mpv --heartbeat-cmd="gnome-screensaver-command -p" file``
+        ``mpv --heartbeat-cmd="gnome-screensaver-command --deactivate" file``
 
 
 ``--heartbeat-interval=<sec>``
-- 
cgit v1.2.3


From ababfcbfe33942170ca578c956a9dea727d7f04c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 8 May 2016 11:05:01 +0200
Subject: manpage: document --x11-bypass-compositor=no

Requested.
---
 DOCS/man/options.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index f3f0002e6f..a4a0568f7f 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2090,7 +2090,10 @@ Window
     (default: ``fs-only``). This uses the ``_NET_WM_BYPASS_COMPOSITOR`` hint.
 
     ``fs-only`` asks the window manager to disable the compositor only in
-    fullscreen mode,
+    fullscreen mode.
+
+    ``no`` sets ``_NET_WM_BYPASS_COMPOSITOR`` to 0, which is the default value
+    as declared by the EWMH specification, i.e. no change is done.
 
     ``never`` asks the window manager to never disable the compositor.
 
-- 
cgit v1.2.3


From 7d9eab15f00e38a5b4c25d084a904e3a8439807b Mon Sep 17 00:00:00 2001
From: maniak1349 <maniak1349@gmail.com>
Date: Thu, 5 May 2016 08:56:21 +0300
Subject: win32: make taskbar progress indication optional

Add --taskbar-progress command line option and property which controls taskbar
progress indication rendering in Windows 7+. This option is on by default and
can be toggled during playback.

This option does not affect the creation process of ITaskbarList3. When the
option is turned off the progress bar is just hidden with TBPF_NOPROGRESS.

Closes #2535
---
 DOCS/man/input.rst   | 3 +++
 DOCS/man/options.rst | 6 ++++++
 2 files changed, 9 insertions(+)

(limited to 'DOCS/man')

diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index ea9eb07715..7b525d7aa8 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -1349,6 +1349,9 @@ Property list
 ``colormatrix-primaries`` (R)
     See ``colormatrix``.
 
+``taskbar-progress`` (RW)
+    See ``--taskbar-progress``.
+
 ``ontop`` (RW)
     See ``--ontop``.
 
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index a4a0568f7f..ce129e3ff9 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1794,6 +1794,12 @@ Window
         mode can be used to create the window always on program start, but this
         may cause other issues.
 
+``--taskbar-progress``, ``--no-taskbar-progress``
+    (Windows only)
+    Enable/disable playback progress rendering in taskbar (Windows 7 and above).
+    
+    Enabled by default.
+
 ``--ontop``
     Makes the player window stay on top of other windows.
 
-- 
cgit v1.2.3


From 73aa7484f23b5fc006d930200b366d5193af9fe3 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 9 May 2016 20:39:33 +0200
Subject: manpage: fix some script_message references to preferred name

---
 DOCS/man/input.rst | 8 ++++----
 DOCS/man/lua.rst   | 6 +++---
 DOCS/man/osc.rst   | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index 7b525d7aa8..2c434b17bb 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -634,10 +634,10 @@ Input Commands that are Possibly Subject to Change
     Send a message to all clients, and pass it the following list of arguments.
     What this message means, how many arguments it takes, and what the arguments
     mean is fully up to the receiver and the sender. Every client receives the
-    message, so be careful about name clashes (or use ``script_message_to``).
+    message, so be careful about name clashes (or use ``script-message-to``).
 
 ``script-message-to "<target>" "<arg1>" "<arg2>" ...``
-    Same as ``script_message``, but send it only to the client named
+    Same as ``script-message``, but send it only to the client named
     ``<target>``. Each client (scripts etc.) has a unique name. For example,
     Lua scripts can get their name via ``mp.get_script_name()``.
 
@@ -651,8 +651,8 @@ Input Commands that are Possibly Subject to Change
     separator, e.g. ``script_binding scriptname/bindingname``.
 
     For completeness, here is how this command works internally. The details
-    could change any time. On any matching key event, ``script_message_to``
-    or ``script_message`` is called (depending on whether the script name is
+    could change any time. On any matching key event, ``script-message-to``
+    or ``script-message`` is called (depending on whether the script name is
     included), with the following arguments:
 
     1. The string ``key-binding``.
diff --git a/DOCS/man/lua.rst b/DOCS/man/lua.rst
index 6b2c5af031..35124a788f 100644
--- a/DOCS/man/lua.rst
+++ b/DOCS/man/lua.rst
@@ -454,9 +454,9 @@ are useful only in special situations.
     The level is a string, see ``msg.log`` for allowed log levels.
 
 ``mp.register_script_message(name, fn)``
-    This is a helper to dispatch ``script_message`` or ``script_message_to``
-    invocations to Lua functions. ``fn`` is called if ``script_message`` or
-    ``script_message_to`` (with this script as destination) is run
+    This is a helper to dispatch ``script-message`` or ``script-message-to``
+    invocations to Lua functions. ``fn`` is called if ``script-message`` or
+    ``script-message-to`` (with this script as destination) is run
     with ``name`` as first parameter. The other parameters are passed to ``fn``.
     If a message with the given name is already registered, it's overwritten.
 
diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst
index 587b8104d2..c737d2e898 100644
--- a/DOCS/man/osc.rst
+++ b/DOCS/man/osc.rst
@@ -266,6 +266,6 @@ Example
 You could put this into ``input.conf`` to hide the OSC with the ``a`` key and
 to set auto mode (the default) with ``b``::
 
-    a script_message osc-visibility never
-    b script_message osc-visibility auto
+    a script-message osc-visibility never
+    b script-message osc-visibility auto
 
-- 
cgit v1.2.3


From 5d8d8618c41b07a22edc296b34d69f306141cb3e Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 10 May 2016 11:15:45 +0200
Subject: manpage: document -- and some issues passing filenames

---
 DOCS/man/mpv.rst | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index bdde369672..abb1cd0ac0 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -320,11 +320,22 @@ example, paths starting with ``-`` will be interpreted as options. Likewise,
 if a path contains the sequence ``://``, the string before that might be
 interpreted as protocol prefix, even though ``://`` can be part of a legal
 UNIX path. To avoid problems with arbitrary paths, you should be sure that
-absolute paths passed to mpv start with ``/``, and relative paths with ``./``.
+absolute paths passed to mpv start with ``/``, and prefix relative paths with
+``./``.
+
+Using the ``file://`` pseudo-protocol is discouraged, because it involves
+strange URL unescaping rules.
 
 The name ``-`` itself is interpreted as stdin, and will cause mpv to disable
 console controls. (Which makes it suitable for playing data piped to stdin.)
 
+The special argument ``--`` can be used to stop mpv from interpreting the
+following arguments as options.
+
+when using the client API, you should strictly avoid using ``mpv_command_string``
+for invoking the ``loadfile`` command, and instead prefer e.g. ``mpv_command``
+to avoid the need for filename escaping.
+
 For paths passed to suboptions, the situation is further complicated by the
 need to escape special characters. To work this around, the path can be
 additionally wrapped in the fixed-length syntax, e.g. ``%n%string_of_length_n``
-- 
cgit v1.2.3


From 2ec26b8396c8d44def148351ee370fde4b950cbf Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 11 May 2016 16:18:05 +0200
Subject: manpage: unmark d3d11va as "experimental"

Also add missing mediacodec entry.
---
 DOCS/man/options.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index ce129e3ff9..ab34e6468e 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -588,8 +588,9 @@ Video
     :dxva2: requires ``--vo=opengl:backend=angle`` or
         ``--vo=opengl:backend=dxinterop`` (Windows only)
     :dxva2-copy: copies video back to system RAM (Windows only)
-    :d3d11va: experimental, requires ``--vo=opengl:backend=angle`` (Windows only)
-    :d3d11va-copy: experimental (Windows only)
+    :d3d11va: requires ``--vo=opengl:backend=angle`` (Windows only)
+    :d3d11va-copy: copies video back to system RAM (Windows only)
+    :mediacodec: copies video back to system RAM (Android only)
     :rpi:       requires ``--vo=rpi`` (Raspberry Pi only - default if available)
 
     ``auto`` tries to automatically enable hardware decoding using the first
-- 
cgit v1.2.3


From 70b35612704a992dac45856e069608216f41ea89 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 11 May 2016 16:18:58 +0200
Subject: video: add --hwdec=auto-copy mode

This uses the normal autoprobing rules like "auto", but rejects anything
that isn't flagged as copying data back to system memory.

The chunk in command.c was dead code, so remove it instead of updating
it.
---
 DOCS/man/options.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index ab34e6468e..c61a556296 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -581,6 +581,7 @@ Video
 
     :no:        always use software decoding (default)
     :auto:      see below
+    :auto-copy: see below
     :vdpau:     requires ``--vo=vdpau`` or ``--vo=opengl`` (Linux only)
     :vaapi:     requires ``--vo=opengl`` or ``--vo=vaapi`` (Linux only)
     :vaapi-copy: copies video back into system RAM (Linux with Intel GPUs only)
@@ -600,6 +601,13 @@ Video
     work, it will always fall back to software decoding, instead of trying the
     next method (might matter on some Linux systems).
 
+    ``auto-copy`` selects only modes that copy the video data back to system
+    memory after decoding. Currently, this selects only one of the following
+    modes: ``vaapi-copy``, ``dxva2-copy``, ``d3d11va-copy``, ``mediacodec``.
+    If none of these work, hardware decoding is disabled. This mode is always
+    guaranteed to incur no additional loss compared to software decoding, and
+    will allow CPU processing with video filters.
+
     The ``vaapi`` mode, if used with ``--vo=opengl``, requires Mesa 11 and most
     likely works with Intel GPUs only. It also requires the opengl EGL backend
     (automatically used if available). You can also try the old GLX backend by
-- 
cgit v1.2.3


From 809d2352088234bf040c257fea2068838e95d5a1 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 11 May 2016 19:12:49 +0200
Subject: manpage: document missing sub-properties

This is the client-API part; the normal descriptions are present in the
text above.
---
 DOCS/man/input.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'DOCS/man')

diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index 2c434b17bb..095a91bb35 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -1815,9 +1815,11 @@ Property list
                 "albumart"          MPV_FORMAT_FLAG
                 "default"           MPV_FORMAT_FLAG
                 "forced"            MPV_FORMAT_FLAG
+                "selected"          MPV_FORMAT_FLAG
                 "external"          MPV_FORMAT_FLAG
                 "external-filename" MPV_FORMAT_STRING
                 "codec"             MPV_FORMAT_STRING
+                "ff-index"          MPV_FORMAT_INT64
                 "decoder-desc"      MPV_FORMAT_STRING
                 "demux-w"           MPV_FORMAT_INT64
                 "demux-h"           MPV_FORMAT_INT64
-- 
cgit v1.2.3


From 6ae7a555bfd0dde6967d716b4439f1c47911b5d4 Mon Sep 17 00:00:00 2001
From: Julian <MyFakeAcc.4@googlemail.com>
Date: Sun, 15 May 2016 02:57:44 +0900
Subject: lua: add timer:is_enabled() function

Allows to query if some timer is currently running or was
stopped/killed.
---
 DOCS/man/lua.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'DOCS/man')

diff --git a/DOCS/man/lua.rst b/DOCS/man/lua.rst
index 35124a788f..b0d66c1760 100644
--- a/DOCS/man/lua.rst
+++ b/DOCS/man/lua.rst
@@ -350,6 +350,10 @@ The ``mp`` module is preloaded, although it can be loaded manually with
             with ``add_timeout()``), this starts the timer from the beginning,
             using the initially configured timeout.
 
+        ``is_enabled()``
+            Whether the timer is currently enabled or was previously disabled
+            (e.g. by ``stop()`` or ``kill()``).
+
         ``timeout`` (RW)
             This field contains the current timeout period. This value is not
             updated as time progresses. It's only used to calculate when the
-- 
cgit v1.2.3


From 7c3d78fd82d4d1e1a0b15284386d39b4014cb7d1 Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@nand.wakku.to>
Date: Thu, 21 Apr 2016 01:33:13 +0200
Subject: vo_opengl: support external user hooks

This allows users to add their own near-arbitrary hooks to the vo_opengl
processing pipeline, greatly enhancing the flexibility of user shaders.
This enables, among other things, user shaders such as CrossBilateral,
SuperRes, LumaSharpen and many more.

To make parsing the user shaders easier, shaders are now loaded as
bstrs, and the hooks are set up during video reconfig instead of on
every single frame.
---
 DOCS/man/vo.rst | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)

(limited to 'DOCS/man')

diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 647dd8c1a4..3f19c4c2ab 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -700,6 +700,119 @@ Available video output drivers are:
                 return vec4(1.0 - color.rgb, color.a);
             }
 
+    ``user-shaders=<files>``
+        Custom GLSL hooks. These are similar to ``post-shaders`` etc., but more
+        flexible: They can be injected at almost arbitrary points in the
+        rendering pipeline, and access all previous intermediate textures.
+
+        The general syntax of a user shader looks like this::
+
+            //!METADATA ARGS...
+            //!METADATA ARGS...
+
+            vec4 hook() {
+               ...
+               return something;
+            }
+
+            //!METADATA ARGS...
+            //!METADATA ARGS...
+
+            ...
+
+        Each block of metadata, along with the non-metadata lines after it,
+        defines a single pass. Each pass can set the following metadata:
+
+        HOOK <name> (required)
+            The texture which to hook into. May occur multiple times within a
+            metadata block, up to a predetermined limit. See below for a list
+            of hookable textures.
+
+        BIND <name>
+            Loads a texture and makes it available to the pass, and sets up
+            macros to enable accessing it. See below for a list of set macros.
+            By default, no textures are bound. The special name HOOKED can be
+            used to refer to the texture that triggered this pass.
+
+        SAVE <name>
+            Gives the name of the texture to save the result of this pass
+            into. By default, this is set to the special name HOOKED which has
+            the effect of overwriting the hooked texture.
+
+        TRANSFORM sx sy ox oy
+            Specifies how this pass intends to transform the hooked texture.
+            ``sx``/``sy`` refer to a linear scale factor, and ``ox``/``oy``
+            refer to a constant pixel shift that the shader will introduce. The
+            default values are 1 1 0 0 which leave the texture size unchanged.
+
+        COMPONENTS n
+            Specifies how many components of this pass's output are relevant
+            and should be stored in the texture, up to 4 (rgba). By default,
+            this value is equal to the number of components in HOOKED.
+
+        Each bound texture (via ``BIND``) will make available the following
+        definitions to that shader pass, where NAME is the name of the bound
+        texture:
+
+        sampler NAME
+            The bound texture itself.
+        vec2 NAME_pos
+            The local texture coordinate of that texture, range [0,1].
+        vec2 NAME_size
+            The (rotated) size in pixels of the texture.
+        vec2 NAME_pt
+            The (unrotated) size of a single pixel, range [0,1].
+
+        In addition, the global uniforms described in ``post-shaders`` are
+        also available.
+
+        Internally, vo_opengl may generate any number of the following
+        textures. Whenever a texture is rendered and saved by vo_opengl, all of
+        the passes that have hooked into it will run, in the order they were
+        added by the user. This is a list of the legal hook points:
+
+        RGB, LUMA, CHROMA, ALPHA, XYZ (resizable)
+            Source planes (raw). Which of these fire depends on the image
+            format of the source.
+
+        CHROMA_SCALED, ALPHA_SCALED (fixed)
+            Source planes (upscaled). These only fire on subsampled content.
+
+        NATIVE (resizable)
+            The combined image, in the source colorspace, before conversion
+            to RGB.
+
+        MAINPRESUB (resizable)
+            The image, after conversion to RGB, but before
+            ``blend-subtitles=video`` is applied.
+
+        MAIN (resizable)
+            The main image, after conversion to RGB but before upscaling.
+
+        LINEAR (fixed)
+            Linear light image, before scaling. This only fires when
+            ``linear-scaling`` is in effect.
+
+        SIGMOID (fixed)
+            Sigmoidized light, before scaling. This only fires when
+            ``sigmoid-upscaling`` is in effect.
+
+        PREKERNEL (fixed)
+            The image immediately before the scaler kernel runs.
+
+        POSTKERNEL (fixed)
+            The image immediately after the scaler kernel runs.
+
+        SCALED (fixed)
+            The final upscaled image, before color management.
+
+        OUTPUT (fixed)
+            The final output image, after color management but before
+            dithering and drawing to screen.
+
+        Only the textures labelled with (resizable) may be transformed by
+        the pass. For all others, the TRANSFORM must be 1 1 0 0 (default).
+
     ``deband``
         Enable the debanding algorithm. This greatly reduces the amount of
         visible banding, blocking and other quantization artifacts, at the
-- 
cgit v1.2.3


From 034faaa9d818bd8c1c52c879e383b8e7350d3df5 Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@nand.wakku.to>
Date: Thu, 12 May 2016 03:34:47 +0200
Subject: vo_opengl: use RPN expressions for user hook sizes

This replaces the previous TRANSFORM by WIDTH, HEIGHT and OFFSET where
WIDTH and HEIGHT are RPN expressions. This allows for more fine-grained
control over the output size, and also makes sure that overwriting
existing textures works more cleanly.

(Also add some more useful bstr functions)
---
 DOCS/man/vo.rst | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 3f19c4c2ab..4d6972e5a3 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -739,11 +739,20 @@ Available video output drivers are:
             into. By default, this is set to the special name HOOKED which has
             the effect of overwriting the hooked texture.
 
-        TRANSFORM sx sy ox oy
-            Specifies how this pass intends to transform the hooked texture.
-            ``sx``/``sy`` refer to a linear scale factor, and ``ox``/``oy``
-            refer to a constant pixel shift that the shader will introduce. The
-            default values are 1 1 0 0 which leave the texture size unchanged.
+        WIDTH <szexpr>, HEIGHT <szexpr>
+            Specifies the size of the resulting texture for this pass.
+            ``szexpr`` refers to an expression in RPN (reverse polish
+            notation), using the operators + - * /, floating point literals,
+            and references to existing texture sizes such as MAIN.width or
+            CHROMA.height. By default, these are set to HOOKED.w and HOOKED.h,
+            respectively.
+
+        OFFSET ox oy
+            Indicates a pixel shift (offset) introduced by this pass. These
+            pixel offsets will be accumulated and corrected during the
+            next scaling pass (``cscale`` or ``scale``). The default values
+            are 0 0 which correspond to no shift. Note that offsets are ignored
+            when not overwriting the hooked texture.
 
         COMPONENTS n
             Specifies how many components of this pass's output are relevant
@@ -810,8 +819,9 @@ Available video output drivers are:
             The final output image, after color management but before
             dithering and drawing to screen.
 
-        Only the textures labelled with (resizable) may be transformed by
-        the pass. For all others, the TRANSFORM must be 1 1 0 0 (default).
+        Only the textures labelled with ``resizable`` may be transformed by the
+        pass. When overwriting a texture marked ``fixed``, the WIDTH, HEIGHT
+        and OFFSET must be left at their default values.
 
     ``deband``
         Enable the debanding algorithm. This greatly reduces the amount of
-- 
cgit v1.2.3


From 362015cd770de486c5dea218d3609450682756ca Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@nand.wakku.to>
Date: Sat, 14 May 2016 07:05:04 +0200
Subject: vo_opengl: abstract hook texture access behind macro

This macro takes care of rotation, swizzling, integer conversion and
normalization automatically. I found the performance impact to be
nonexistant for superxbr and debanding, although rotation *did* have an
impact due to the extra matrix multiplication. (So it gets skipped where
possible)

All of the internal hooks have been rewritten to use this new mechanism,
and the prescaler hooks have finally been separated from each other.
This also means the prescale FBO kludge is no longer required.

This fixes image corruption for image formats like 0bgr, and also fixes
prescaling under rotation. (As well as other user hooks that have
orientation-dependent access)

The "raw" attributes (tex, tex_pos, pixel_size) are still un-rotated, in
case something needs them, but ideally the hooks should be rewritten to
use the new API as much as possible. The hooked texture has been renamed
from just NAME to NAME_raw to make script authors notice the change (and
also deemphasize direct texture access).

This is also a step towards getting rid of the use_integer pass.
---
 DOCS/man/vo.rst | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 4d6972e5a3..7892761581 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -763,14 +763,26 @@ Available video output drivers are:
         definitions to that shader pass, where NAME is the name of the bound
         texture:
 
-        sampler NAME
-            The bound texture itself.
+        vec4 NAME_tex(vec2 pos)
+            The sampling function to use to access the texture at a certain
+            spot (in texture coordinate space, range [0,1]). This takes care
+            of any necessary normalization conversions.
+        vec4 NAME_texOff(vec2 offset)
+            Sample the texture at a certain offset in pixels. This works like
+            NAME_tex but additionally takes care of necessary rotations, so
+            that sampling at e.g. vec2(-1,0) is always one pixel to the left.
         vec2 NAME_pos
             The local texture coordinate of that texture, range [0,1].
         vec2 NAME_size
             The (rotated) size in pixels of the texture.
+        mat2 NAME_rot
+            The rotation matrix associated with this texture. (Rotates
+            pixel space to texture coordinates)
         vec2 NAME_pt
             The (unrotated) size of a single pixel, range [0,1].
+        sampler NAME_raw
+            The raw bound texture itself. The use of this should be
+            avoided unless absolutely necessary.
 
         In addition, the global uniforms described in ``post-shaders`` are
         also available.
-- 
cgit v1.2.3


From f81f486c68ca55c1e6175e41b0473d9568a6fe5b Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@nand.wakku.to>
Date: Sun, 15 May 2016 20:16:12 +0200
Subject: vo_opengl: implement HDR (SMPTE ST2084)

Currently, this relies on the user manually entering their display
brightness (since we have no way to detect this at runtime or from ICC
metadata). The default value of 250 was picked by looking at ~10 reviews
on tftcentral.co.uk and realizing they all come with around 250 cd/m^2
out of the box. (In addition, ITU-R Rec. BT.2022 supports this)

Since there is no metadata in FFmpeg to indicate usage of this TRC, the
only way to actually play HDR content currently is to set
``--vf=format=gamma=st2084``. (It could be guessed based on SEI, but
this is not implemented yet)

Incidentally, since SEI is ignored, it's currently assumed that all
content is scaled to 10,000 cd/m^2 (and hard-clipped where out of
range). I don't see this assumption changing much, though.

As an unfortunate consequence of the fact that we don't know the display
brightness, mixed with the fact that LittleCMS' parametric tone curves
are not flexible enough to support PQ, we have to build the 3DLUT
against gamma 2.2 if it's used. This might be a good thing, though,
consdering the PQ source space is probably not fantastic for
interpolation either way.

Partially addresses #2572.
---
 DOCS/man/vf.rst | 1 +
 DOCS/man/vo.rst | 8 ++++++++
 2 files changed, 9 insertions(+)

(limited to 'DOCS/man')

diff --git a/DOCS/man/vf.rst b/DOCS/man/vf.rst
index 46384eb20f..e742bc4ada 100644
--- a/DOCS/man/vf.rst
+++ b/DOCS/man/vf.rst
@@ -310,6 +310,7 @@ Available filters are:
        :gamma2.2:     Pure power curve (gamma 2.2)
        :gamma2.8:     Pure power curve (gamma 2.8)
        :prophoto:     ProPhoto RGB (ROMM) curve
+       :st2084:       SMPTE ST2084 (HDR) curve
 
     ``<stereo-in>``
         Set the stereo mode the video is assumed to be encoded in. Takes the
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 7892761581..046fa7e0e6 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -1052,6 +1052,14 @@ Available video output drivers are:
             Pure power curve (gamma 2.8), also used for BT.470-BG
         prophoto
             ProPhoto RGB (ROMM)
+        st2084
+            SMPTE ST2084 (HDR) curve, PQ OETF
+
+    ``target-brightness=<1..100000>``
+        Specifies the display's approximate brightness in cd/m^2. When playing
+        HDR content, video colors will be scaled and clipped to this
+        brightness. The default of 250 cd/m^2 corresponds to a typical consumer
+        display.
 
     ``icc-profile=<file>``
         Load an ICC profile and use it to transform video RGB to screen output.
-- 
cgit v1.2.3


From e047cc0931a22d277d7ccd14588f905d7852f7e0 Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@nand.wakku.to>
Date: Mon, 16 May 2016 02:44:30 +0200
Subject: vo_opengl: implement more HDR tonemapping algorithms

This is now a configurable option, with tunable parameters.

I got inspiration for these algorithms off wikipedia. "simple" seems to
work pretty well, but not well enough to make it a reasonable default.

Some other notable candidates:

- Local functions (e.g. based on local contrast or gradient)
- Clamp with soft knee (linear up to a point)
- Mapping in CIE L*Ch. Map L smoothly, clamp C and h.
- Color appearance models

These will have to be implemented some other time.

Note that the parameter "peak_src" to pass_tone_map should, in
principle, be auto-detected from the SEI information of the source file
where available. This will also have to be implemented in a later
commit.
---
 DOCS/man/vo.rst | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 046fa7e0e6..7792831dd5 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -1057,9 +1057,38 @@ Available video output drivers are:
 
     ``target-brightness=<1..100000>``
         Specifies the display's approximate brightness in cd/m^2. When playing
-        HDR content, video colors will be scaled and clipped to this
-        brightness. The default of 250 cd/m^2 corresponds to a typical consumer
-        display.
+        HDR content, video colors will be tone mapped to this target brightness
+        using the algorithm specified by ``hdr-tone-mapping``. The default of
+        250 cd/m^2 corresponds to a typical consumer display.
+
+    ``hdr-tone-mapping=<value>``
+        Specifies the algorithm used for tone-mapping HDR images onto the
+        target display. Valid values are:
+
+        clip
+            Hard-clip any out-of-range values (default)
+        simple
+            Very simple continuous curve. Preserves dynamic range and peak but
+            uses nonlinear contrast.
+        gamma
+            Fits a logarithmic transfer between the tone curves.
+        linear
+            Linearly stretches the entire reference gamut to (a linear multiple
+            of) the display.
+
+    ``tone-mapping-param=<value>``
+        Set tone mapping parameters. Ignored if the tone mapping algorithm is
+        not tunable. This affects the following tone mapping algorithms:
+
+        simple
+            Specifies the local contrast coefficient at the display peak.
+            Defaults to 0.5, which means that in-gamut values will be about
+            half as bright as when clipping.
+        gamma
+            Specifies the exponent of the function. Defaults to 1.8.
+        linear
+            Specifies the scale factor to use while stretching. Defaults to
+            1.0.
 
     ``icc-profile=<file>``
         Load an ICC profile and use it to transform video RGB to screen output.
-- 
cgit v1.2.3


From 320627d600e4575f4252fba08337916561945e1f Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 16 May 2016 12:41:08 +0200
Subject: manpage: declare user-shader syntax for not stable

---
 DOCS/man/vo.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'DOCS/man')

diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 7792831dd5..c5d7513f4d 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -705,6 +705,10 @@ Available video output drivers are:
         flexible: They can be injected at almost arbitrary points in the
         rendering pipeline, and access all previous intermediate textures.
 
+        .. admonition:: Warning
+
+            The syntax is not stable yet and may change any time.
+
         The general syntax of a user shader looks like this::
 
             //!METADATA ARGS...
-- 
cgit v1.2.3


From 79afa347cc8eb0a52e3acc11598eb6d497b938d5 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 20 May 2016 23:21:43 +0200
Subject: vo_opengl: remove non-working rgb/rgba FBO formats

Following commit 84ccebd9, the internal helpers don't allow GL_RGB and
GL_RGBA as internal formats for FBO attachments anymore.

While OpenGL itself is perfectly fine with it, I don't see much of a
reason to bother, and mixing sized and unsized internal formats is
confusing anyway.

Just remove these formats.
---
 DOCS/man/vo.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index c5d7513f4d..d8c0925744 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -974,7 +974,7 @@ Available video output drivers are:
     ``fbo-format=<fmt>``
         Selects the internal format of textures used for FBOs. The format can
         influence performance and quality of the video output.
-        ``fmt`` can be one of: rgb, rgba, rgb8, rgb10, rgb10_a2, rgb16, rgb16f,
+        ``fmt`` can be one of: rgb8, rgb10, rgb10_a2, rgb16, rgb16f,
         rgb32f, rgba12, rgba16, rgba16f, rgba32f.
         Default: ``auto``, which maps to rgba16 on desktop GL, and rgba16f or
         rgb10_a2 on GLES (e.g. ANGLE), unless GL_EXT_texture_norm16 is
-- 
cgit v1.2.3


From afcef4c25b8dabff92716c3995e26068362bc3aa Mon Sep 17 00:00:00 2001
From: Ben Boeckel <mathstuf@gmail.com>
Date: Mon, 23 May 2016 12:43:49 -0400
Subject: docs: fix some typos

---
 DOCS/man/mpv.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index abb1cd0ac0..736ef02c48 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -332,7 +332,7 @@ console controls. (Which makes it suitable for playing data piped to stdin.)
 The special argument ``--`` can be used to stop mpv from interpreting the
 following arguments as options.
 
-when using the client API, you should strictly avoid using ``mpv_command_string``
+When using the client API, you should strictly avoid using ``mpv_command_string``
 for invoking the ``loadfile`` command, and instead prefer e.g. ``mpv_command``
 to avoid the need for filename escaping.
 
-- 
cgit v1.2.3


From 335278b86ecb5c6dc054cc514ff909d69639cd61 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 23 May 2016 22:55:30 +0200
Subject: manpage: document how hardware decoding might cause quality loss

---
 DOCS/man/options.rst | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index c61a556296..b583e63b38 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -629,6 +629,42 @@ Video
         codecs. See ``--hwdec-codecs`` to enable hardware decoding for more
         codecs.
 
+    .. admonition:: Quality reduction with hardware decoding
+
+        Normally, hardware decoding does not reduce video quality (at least for
+        the codecs h264 and HEVC). However, due to restrictions in video output
+        APIs, there can be some loss, or blatantly incorrect results.
+
+        In some cases, RGB conversion is forced, which means the RGB conversion
+        is performed by the hardware decoding API, instead of the OpenGL code
+        used by ``--vo=opengl``. This means certain obscure colorspaces may
+        not display correctly, and not certain filtering (such as debanding)
+        can not be applied in an ideal way.
+
+        ``vdpau`` forces RGB conversion. Currently, it does not treat certain
+        colorspaces like BT.2020 correctly. This is mostly a mpv-specific
+        restriction. This does not apply if the ``vdpauprb`` filter is used.
+
+        ``vaapi`` is safe if the ``vaapi-egl`` backend is indicated in the logs.
+        If ``vaapi-glx`` is indicated, and the video colorspace is either BT.601
+        or BT.709, a forced but correct RGB conversion is performed. Otherwise,
+        the result will be incorrect.
+
+        ``d3d11va`` is usually safe. If the ``EGL_KHR_stream path`` is indicated
+        in the logs, it is lossless and full OpenGL filtering is done. If
+        ``ID3D11VideoProcessor path`` is indicated, and the video colorspace is
+        either BT.601 or BT.709, a forced but correct RGB conversion is
+        performed. Otherwise, the result will be incorrect.
+
+        ``dxva2`` is not safe. It uses either BT.601 or BT.709 for forced RGB
+        conversion, and which colorspace is used is driver-dependent. This can
+        give incorrect results even with completely ordinary video sources.
+
+        All other methods, in particular the copy-back methods (like
+        ``dxva2-copy`` etc.) are either fully safe, or not worse than software
+        decoding. In particular, ``auto-copy`` will only select safe modes
+        (although potentially slower than other methods).
+
 ``--hwdec-preload=<api>``
     This is useful for the ``opengl`` and ``opengl-cb`` VOs for creating the
     hardware decoding OpenGL interop context, but without actually enabling
-- 
cgit v1.2.3


From 6bd021e4ee30275ba6fe7d2e306909b57fd368dd Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 23 May 2016 23:46:58 +0200
Subject: manpage: adjust dxva2 description

---
 DOCS/man/options.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index b583e63b38..f46990f404 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -656,9 +656,12 @@ Video
         either BT.601 or BT.709, a forced but correct RGB conversion is
         performed. Otherwise, the result will be incorrect.
 
-        ``dxva2`` is not safe. It uses either BT.601 or BT.709 for forced RGB
-        conversion, and which colorspace is used is driver-dependent. This can
-        give incorrect results even with completely ordinary video sources.
+        ``dxva2`` is not safe. It appears to always use BT.601 for forced RGB
+        conversion, but actual behavior depends on the GPU drivers. Some drivers
+        appear to convert to limited range RGB, which gives a faded appearance.
+        In addition to driver-specific behavior, global system settings might
+        affect this additionally. This can give incorrect results even with
+        completely ordinary video sources.
 
         All other methods, in particular the copy-back methods (like
         ``dxva2-copy`` etc.) are either fully safe, or not worse than software
-- 
cgit v1.2.3


From e5f49d96855a8d3ccf3b6ad8b8de811d1391d806 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 26 May 2016 00:07:10 +0200
Subject: vo_opengl: always autoselect ANGLE as backend if available

Remove the opengl-hq option default that caused it not to autoselect
ANGLE (unlike --vo=opengl). Details see commit d5df90a2.

Back then the intention was to use ANGLE by default, since it integrates
much nicer with the Windows compositor (instead of native OpenGL, which
tends to cause crazy glitches). On the other hand, many opengl-hq
capabilities are not available with older ANGLE builds, so it didn't
make any sense to autoselect ANGLE for it.

With the GL_EXT_texture_norm16 extension recently added to ANGLE, it has
essentially reached feature parity to desktop GL for the subset we are
using. (Even the integer texture hack for high bit depth input could be
dropped now.)

It (probably) still does not support nnedi3, due to the weird way the NN
coefficients are imported. Also, it uses half-floats instead of 16 bit
fixed-point textures for technical reasons, which implies about 5 bits
of precision loss. If anyone actually manages to distinguish the two
dithering texture formats in a double-blind test, I will fix it.
---
 DOCS/man/vo.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'DOCS/man')

diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index d8c0925744..e3096ab46f 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -946,8 +946,8 @@ Available video output drivers are:
             Win32/WGL
         angle
             Direct3D11 through the OpenGL ES translation layer ANGLE. This
-            supports almost everything the ``win`` backend does, except ICC
-            profiles, and the ``nnedi3`` prescaler.
+            supports almost everything the ``win`` backend does (if the ANGLE
+            build is new enough), except the ``nnedi3`` prescaler.
         dxinterop (experimental)
             Win32, using WGL for rendering and Direct3D 9Ex for presentation.
             Works on Nvidia and AMD. Newer Intel chips with the latest drivers
-- 
cgit v1.2.3


From ca87e623b5651d5c94274bdede86768a5562dd56 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 26 May 2016 18:43:49 +0200
Subject: command: add playlist-pos-1 property

This has often been requested for use on OSD. I don't really like having
such "special" properties, but whatever. Hopefully this will be the only
case.

Untested because I'm too damn lazy.

Fixes #2828.
---
 DOCS/man/input.rst