Merge branch 'mpv-player:master' into plex-htpc-hdr-patches

DOCS/interface-changes.rst

@@ -27,6 +27,7 @@ Interface changes
 ::
 
  --- mpv 0.36.0 ---
+    - add `--target-contrast`
     - Target luminance value is now also applied when ICC profile is used.
       `--icc-use-luma` has been added to use ICC profile luminance value.
       If target luminance and ICC luminance is not used, old behavior apply,
@@ -86,6 +87,8 @@ Interface changes
       --no-gpu-shader-cache to disable)
     - add `--directory-mode=recursive|lazy|ignore`
     - ctrl+h now uses `auto-safe` rather than `auto` when turing on hardware decoding
+    - add `--hdr-contrast-recovery` and `--hdr-contrast-smoothness`
+    - include `--hdr-contrast-recovery` in the `gpu-hq` profile
  --- mpv 0.35.0 ---
     - add the `--vo=gpu-next` video output driver, as well as the options
       `--allow-delayed-peak-detect`, `--builtin-scalers`,

DOCS/man/mpv.rst

@@ -1678,3 +1678,11 @@ future.
 
 Note that mpv likes to mix ``/`` and ``\`` path separators for simplicity.
 kernel32.dll accepts this, but cmd.exe does not.
+
+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.
+Everything else is the same as `FILES`_.

DOCS/man/options.rst

@@ -4334,11 +4334,11 @@ Screenshot
     :avif:      AVIF
 
 ``--screenshot-tag-colorspace=<yes|no>``
-    Tag screenshots with the appropriate colorspace.
+    Tag screenshots with the appropriate colorspace (default: yes).
 
-    Note that not all formats are supported.
-
-    Default: ``yes``.
+    Note that not all formats support this. When it is unsupported, or when
+    this option is disabled, screenshots will be converted to sRGB before
+    being written.
 
 ``--screenshot-high-bit-depth=<yes|no>``
     If possible, write screenshots with a bit depth similar to the source
@@ -6487,6 +6487,15 @@ them.
         In such a configuration, we highly recommend setting ``--tone-mapping``
         to ``mobius`` or even ``clip``.
 
+``--target-contrast=<auto|10-1000000|inf>``
+    Specifies the measured contrast of the output display. ``--target-contrast``
+    in conjunction with ``--target-peak`` value is used to calculate display
+    black point. Used in black point compensation during HDR tone-mapping.
+    ``auto`` is the default and assumes 1000:1 contrast as a typical SDR display
+    would have or an infinite contrast when HDR ``--target-trc`` is used.
+    ``inf`` contrast specifies display with perfect black level, in practice OLED.
+    (Only for ``--vo=gpu-next``)
+
 ``--target-lut=<file>``
     Specifies a custom LUT file (in Adobe .cube format) to apply to the colors
     before display on-screen. This LUT is fed values in normalized RGB, after
@@ -6704,6 +6713,18 @@ them.
     aggressive, up to the limit of the high threshold (at which point the
     filter becomes instant).
 
+``--hdr-contrast-recovery=<0.0..2.0>``, ``--hdr-contrast-smoothness=<1.0..100.0>``
+    Enables the HDR contrast recovery algorithm, which is to designed to
+    enhance contrast of HDR video after tone mapping. The strength (default:
+    0.0) indicates the degree of contrast recovery, with 0.0 being completely
+    disabled and 1.0 being 100% strength. Values higher than 1.0 are allowed,
+    but may result in excessive sharpening. The smoothness (default: 3.5)
+    indicates the degree to which the HDR source is low-passed in order to
+    obtain contrast information - a value of 2.0 corresponds to 2x downscaling.
+    Users on low DPI displays (<= 100) may want to lower this value, while
+    users on very high DPI displays ("retina") may want to increase it. (Only
+    for ``vo=gpu-next``)
+
 ``--use-embedded-icc-profile``
     Load the embedded ICC profile contained in media files such as PNG images.
     (Default: yes). Note that this option only works when also using a display

DOCS/release-policy.md

@@ -44,6 +44,9 @@ If necessary (to e.g. exclude commits already on master), the release can
 be done on a branch with different commit history. The release branch **must**
 then be merged to master so `git describe` will pick up the tag.
 
+This does not apply to patch releases, which are tagged directly on the
+`release/0.X` branch. The master branch always remains at v0.X.0.
+
 Release notes template
 ----------------------
 
@@ -67,13 +70,13 @@ New
 Changed
 ~~~~~~~
 
-- List of removed features
+- List of changed features
 
 
 Removed
-~~~~~~~~~~
+~~~~~~~
 
-- List of deprecated features
+- List of removed features
 
 
 Options and Commands
@@ -117,10 +120,19 @@ A complete changelog can be seen by running `git log <start>..<end>`
 in the git repository.
 ```
 
-Note that the "Release 0.X.Y" title should be removed when creating a new GitHub
-release.
-
 When creating a new point release its changes should be added on top of the
 `RELEASE_NOTES` file (with the appropriate title) so that all the changes in
 the current 0.X branch will be included. This way the `RELEASE_NOTES` file
 can be used by distributors as changelog for point releases too.
+
+The changelog of lists all changes since the last release, including those
+that have been backported to patch releases already.
+
+Some additional advice:
+- Especially for features, try to reword the messages so that the user-visible
+  change is clear to the reader. But don't simplify too much or be too verbose.
+- It often makes sense to merge multiple related changes into one line
+- Changes that have been made and reverted within the same release must not
+  appear in the changelog
+- Limit the "Options and Commands" section to relevant changes
+- When filling in the GitHub release, remove the "Release 0.X.Y" heading

etc/_mpv.zsh

@@ -42,7 +42,7 @@ function _mpv_generate_arguments {
   local -a option_aliases=()
 
   local list_options_line
-  for list_options_line in "${(@f)$($~words[1] --list-options)}"; do
+  for list_options_line in "${(@f)$($~words[1] --no-config --list-options)}"; do
 
     [[ $list_options_line =~ $'^[ \t]+--([^ \t]+)[ \t]*(.*)' ]] || continue
 
@@ -77,6 +77,10 @@ function _mpv_generate_arguments {
       # Save this for later; we might not have parsed the target option yet
       option_aliases+="$name $match[2]"
 
+    elif [[ $desc =~ $'^removed ' ]]; then
+
+      # skip
+
     else
 
       # Option takes argument

etc/builtin.conf

@@ -28,6 +28,9 @@ input-default-bindings=no
 input-vo-keyboard=no
 # OSX/Cocoa global input hooks
 input-media-keys=no
+vlang=
+alang=
+slang=
 
 [encoding]
 vo=lavc
@@ -39,12 +42,16 @@ resume-playback=no
 load-scripts=no
 osc=no
 framedrop=no
+vlang=
+alang=
+slang=
 
 [gpu-hq]
 scale=spline36
 cscale=spline36
 dscale=mitchell
 dither-depth=auto
+hdr-contrast-recovery=0.30
 correct-downscaling=yes
 linear-downscaling=yes
 sigmoid-upscaling=yes

etc/mpv.bash-completion

@@ -18,7 +18,7 @@
 #
 
 # Cache all the mpv options
-_mpv_options=$(mpv --list-options)
+_mpv_options=$(mpv --no-config --list-options)
 
 _mpv_get_args()
 {
@@ -73,9 +73,12 @@ _mpv_get_args()
 }
 
 # This regex detects special options where we don't want an '=' appended
-_mpv_special_regex='Flag.*\[not in config files\]|Print'
-_mpv_regular_options=($(echo "$_mpv_options" | grep -v -E "$_mpv_special_regex" |awk '{print "\\"$1;}' | grep '\--'))
-_mpv_special_options=($(echo "$_mpv_options" | grep -E "$_mpv_special_regex" |awk '{print "\\"$1;}' | grep '\--'))
+_mpv_special_regex='\s(Flag.*\[not in config files\]|Print)'
+_mpv_skip_regex='\sremoved \[deprecated\]'
+_mpv_regular_options=($(echo "$_mpv_options" | grep -vE "$_mpv_skip_regex" | \
+  grep -vE "$_mpv_special_regex" | awk '{print "\\"$1;}' | grep '\--'))
+_mpv_special_options=($(echo "$_mpv_options" | grep -vE "$_mpv_skip_regex" | \
+  grep -E "$_mpv_special_regex" | awk '{print "\\"$1;}' | grep '\--'))
 
 _mpv()
 {