Merge branch 'master' into release/current

DOCS/client-api-changes.rst

@@ -32,7 +32,7 @@ API changes
 
 ::
 
- --- mpv 0.21.0 ---
+ --- mpv 0.22.0 ---
  1.23   - deprecate setting "no-" options via mpv_set_option*(). For example,
           instead of "no-video=" you should set "video=no".
         - do not override the SIGPIPE signal handler anymore. This was done as
@@ -49,8 +49,8 @@ API changes
           will be removed, and mpv_set_option() will internally translate API
           calls to mpv_set_property().
         - qthelper.hpp: deprecate get_property_variant, set_property_variant,
-          mpv_set_option, command_variant, and replace them with get_property,
-          set_property, command.
+          set_option_variant, command_variant, and replace them with
+          get_property, set_property, command.
  --- mpv 0.19.0 ---
  1.22   - add stream_cb API for custom protocols
  --- mpv 0.18.1 ---

DOCS/compile-windows.md

@@ -166,11 +166,8 @@ Or, compile and install both libmpv and mpv:
 ./waf configure CC=gcc.exe --check-c-compiler=gcc --enable-libmpv-shared --prefix=/mingw64
 ./waf install
 
-# waf installs libmpv to the wrong directory, so fix it up
-mv -f /mingw64/bin/pkgconfig/mpv.pc /mingw64/lib/pkgconfig/
-mv -f /mingw64/bin/libmpv.dll.a /mingw64/lib/
-sed -i 's_/mingw64/bin_/mingw64/lib_' /mingw64/lib/pkgconfig/mpv.pc
-rmdir /mingw64/bin/pkgconfig
+# waf installs libmpv dll to the wrong directory, so fix it up
+mv -f /mingw64/lib/mpv-1.dll /mingw64/bin/
 ```
 
 Linking libmpv with MSVC programs

DOCS/interface-changes.rst

@@ -19,9 +19,18 @@ Interface changes
 
 ::
 
+ --- mpv 0.22.0 ---
+    - the "audio-device-list" property now sets empty device description to the
+      device name as a fallback
+    - add --hidpi-window-scale option for macOS
+    - add audiounit audio output for iOS
+    - make --start-time work with --rebase-start-time=no
+    - add --opengl-early-flush=auto mode
+    - add --hwdec=vdpau-copy, deprecate vf_vdpaurb
+    - add tct video output for true-color and 256-color terminals
  --- mpv 0.21.0 ---
-    - setting certain options at runtime will now take care of updating them
-      property (see for example issue #3281). On the other hand, it will also
+    - unlike in older versions, setting options at runtime will now take effect
+      immediately (see for example issue #3281). On the other hand, it will also
       do runtime verification and reject option changes that do not work
       (example: setting the "vf" option to a filter during playback, which fails
       to initialize - the option value will remain at its old value). In general,

DOCS/man/input.rst

@@ -1912,8 +1912,9 @@ Property list
 
     The ``name`` is what is to be passed to the ``--audio-device`` option (and
     often a rather cryptic audio API-specific ID), while ``description`` is
-    human readable free form text. The description is an empty string if none
-    was received.
+    human readable free form text. The description is set to the device name
+    (minus mpv-specific ``<driver>/`` prefix) if no description is available
+    or the description would have been an empty string.
 
     The special entry with the name set to ``auto`` selects the default audio
     output driver and the default device.

DOCS/man/mpv.rst

@@ -646,6 +646,15 @@ PROTOCOLS
     either aliases to documented protocols, or are just redirections to
     protocols implemented and documented in FFmpeg.
 
+``ytdl://...``
+    By default, the youtube-dl hook script (enabled by default for mpv CLI)
+    only looks at http URLs. Prefixing an URL with ``ytdl://`` forces it to
+    be always processed by the script. This can also be used to invoke special
+    youtube-dl functionality like playing a video by ID or invoking search.
+
+    Keep in mind that you can't pass youtube-dl command line options by this,
+    and you have to use ``--ytdl-raw-options`` instead.
+
 ``-``
     Play data from stdin.
 

DOCS/man/osc.rst

@@ -147,95 +147,117 @@ Example::
 Configurable Options
 ~~~~~~~~~~~~~~~~~~~~
 
+``layout``
+    Default: bottombar
+
+    The layout for the OSC. Currently available are: box, slimbox,
+    bottombar and topbar. Default pre-0.21.0 was 'box'.
+
+``seekbarstyle``
+    Default: bar
+
+    Sets the style of the seekbar, slider (diamond marker), knob (circle
+    marker with guide), or bar (fill).
+    Default pre-0.21.0 was 'slider'.
+
+``deadzonesize``
+    Default: 0.5
+
+    Size of the deadzone. The deadzone is an area that makes the mouse act
+    like leaving the window. Movement there won't make the OSC show up and
+    it will hide immediately if the mouse enters it. The deadzone starts
+    at the window border opposite to the OSC and the size controls how much
+    of the window it will span. Values between 0.0 and 1.0, where 0 means the
+    OSC will always popup with mouse movement in the window, and 1 means the
+    OSC will only show up when the mouse hovers it. Default pre-0.21.0 was 0.
+
+``minmousemove``
+    Default: 0
+
+    Minimum amount of pixels the mouse has to move between ticks to make
+    the OSC show up. Default pre-0.21.0 was 3.
+
 ``showwindowed``
-    | Default: yes
-    | Enable the OSC when windowed
+    Default: yes
+
+    Enable the OSC when windowed
 
 ``showfullscreen``
-    | Default: yes
-    | Enable the OSC when fullscreen
+    Default: yes
+
+    Enable the OSC when fullscreen
 
 ``scalewindowed``
-    | Default: 1.5
-    | Scale factor of the OSC when windowed
+    Default: 1.0
+
+    Scale factor of the OSC when windowed.
 
 ``scalefullscreen``
-    | Default: 1.5
-    | Scale factor of the OSC when fullscreen
+    Default: 1.0
+
+    Scale factor of the OSC when fullscreen
 
 ``scaleforcedwindow``
-    | Default: 2.0
-    | Scale factor of the OSC when rendered on a forced (dummy) window
+    Default: 2.0
+
+    Scale factor of the OSC when rendered on a forced (dummy) window
 
 ``vidscale``
-    | Default: yes
-    | Scale the OSC with the video
-    | ``no`` tries to keep the OSC size constant as much as the window size allows
+    Default: yes
+
+    Scale the OSC with the video
+    ``no`` tries to keep the OSC size constant as much as the window size allows
 
 ``valign``
-    | Default: 0.8
-    | Vertical alignment, -1 (top) to 1 (bottom)
+    Default: 0.8
+
+    Vertical alignment, -1 (top) to 1 (bottom)
 
 ``halign``
-    | Default: 0.0
-    | Horizontal alignment, -1 (left) to 1 (right)
+    Default: 0.0
+
+    Horizontal alignment, -1 (left) to 1 (right)
 
 ``barmargin``
-    | Default: 0
-    | Margin from bottom (bottombar) or top (topbar), in pixels
+    Default: 0
+
+    Margin from bottom (bottombar) or top (topbar), in pixels
 
 ``boxalpha``
-    | Default: 80
-    | Alpha of the background box, 0 (opaque) to 255 (fully transparent)
+    Default: 80
 
-``hidetimeout``
-    | Default: 500
-    | Duration in ms until the OSC hides if no mouse movement, must not be
-      negative
+    Alpha of the background box, 0 (opaque) to 255 (fully transparent)
 
-``fadeduration``
-    | Default: 200
-    | Duration of fade out in ms, 0 = no fade
-
-``deadzonesize``
-    | Default: 1
-    | Size of the deadzone. The deadzone is an area that makes the mouse act
-      like leaving the window. Movement there won't make the OSC show up and
-      it will hide immediately if the mouse enters it. The deadzone starts
-      at the window border opposite to the OSC and the size controls how much
-      of the window it will span. Values between 0 and 1, where 0 means the
-      OSC will always popup with mouse movement in the window, and 1 means the
-      OSC will only show up when the mouse hovers it.
+``hidetimeout``
+    Default: 500
 
-``minmousemove``
-    | Default: 0
-    | Minimum amount of pixels the mouse has to move between ticks to make
-      the OSC show up
+    Duration in ms until the OSC hides if no mouse movement, must not be
+    negative
 
-``layout``
-    | Default: bottombar
-    | The layout for the OSC. Currently available are: box, slimbox,
-      bottombar and topbar.
+``fadeduration``
+    Default: 200
 
-``seekbarstyle``
-    | Default: bar
-    | Sets the style of the seekbar, slider (diamond marker) or bar (fill)
+    Duration of fade out in ms, 0 = no fade
 
 ``tooltipborder``
-    | Default: 1
-    | Size of the tooltip outline when using bottombar or topbar layouts
+    Default: 1
+
+    Size of the tooltip outline when using bottombar or topbar layouts
 
 ``timetotal``
-    | Default: no
-    | Show total time instead of time remaining
+    Default: no
+
+    Show total time instead of time remaining
 
 ``timems``
-    | Default: no
-    | Display timecodes with milliseconds
+    Default: no
+
+    Display timecodes with milliseconds
 
 ``visibility``
-    | Default: auto (auto hide/show on mouse move)
-    | Also supports ``never`` and ``always``
+    Default: auto (auto hide/show on mouse move)
+
+    Also supports ``never`` and ``always``
 
 Script Commands
 ~~~~~~~~~~~~~~~
@@ -259,3 +281,7 @@ to set auto mode (the default) with ``b``::
     a script-message osc-visibility never
     b script-message osc-visibility auto
 
+``osc-playlist``, ``osc-chapterlist``, ``osc-tracklist``
+    Shows a limited view of the respective type of list using the OSC. First
+    argument is duration in seconds.
+

DOCS/man/vf.rst

@@ -807,6 +807,8 @@ Available filters are:
             Apply high quality VDPAU scaling (needs capable hardware).
 
 ``vdpaurb``
+    This filter is deprecated. Use ``--hwdec=vdpau-copy`` instead.
+
     VDPAU video read back. Works with ``--vo=vdpau`` and ``--vo=opengl`` only.
     This filter will read back frames decoded by VDPAU so that other filters,
     which are not normally compatible with VDPAU, can be used like normal.

DOCS/man/vo.rst

@@ -159,7 +159,7 @@ Available video output drivers are:
         means timing is somewhat less accurate than without compositing, but
         with the composited mode behavior of the NVIDIA driver, there is no
         hard playback speed limit even without the disabled logic. Enabled by
-        default, use ``no-composite-detect`` to disable.
+        default, use ``--vo-vdpau-composite-detect=no`` to disable.
     ``--vo-vdpau-queuetime-windowed=<number>`` and ``queuetime-fs=<number>``
         Use VDPAU's presentation queue functionality to queue future video
         frame changes at most this many milliseconds in advance (default: 50).
@@ -387,6 +387,28 @@ Available video output drivers are:
 
     .. note:: This driver is a joke.
 
+``tct``
+    Color Unicode art video output driver that works on a text console.
+    Depends on support of true color by modern terminals to display the images
+    at full color range. On Windows it requires an ansi terminal such as mintty.
+
+    ``--vo-tct-algo=<algo>``
+        Select how to write the pixels to the terminal.
+
+        half-blocks
+            Uses unicode LOWER HALF BLOCK character to achieve higher vertical
+            resolution. (Default.)
+        plain
+            Uses spaces. Causes vertical resolution to drop twofolds, but in
+            theory works in more places.
+
+    ``--vo-tct-width=<width>``  ``--vo-tct-height=<height>``
+        Assume the terminal has the specified character width and/or height.
+        These default to 80x25 if the terminal size cannot be determined.
+
+    ``--vo-tct-256=<yes|no>`` (default: no)
+        Use 256 colors - for terminals which don't support true color.
+
 ``image``
     Output each frame into an image file in the current directory. Each file
     takes the frame number padded with leading zeros as name.
@@ -491,7 +513,7 @@ Available video output drivers are:
     Video output driver using Kernel Mode Setting / Direct Rendering Manager.
     Should be used when one doesn't want to install full-blown graphical
     environment (e.g. no X). Does not support hardware acceleration (if you
-    need this, check the ``drm-egl`` backend for ``opengl`` VO).
+    need this, check the ``drm`` backend for ``opengl`` VO).
 
     The following global options are supported by this video output:
 

README.md

@@ -7,13 +7,15 @@
 
 * [Overview](#overview)
 * [Downloads](#downloads)
+* [Changelog](#changelog)
 * [Compilation](#compilation)
 * [FFmpeg vs. Libav](#ffmpeg-vs-libav)
 * [Release cycle](#release-cycle)
 * [Bug reports](#bug-reports)
 * [Contributing](#contributing)
 * [Relation to MPlayer and mplayer2](#relation-to-mplayer-and-mplayer2)
 * [Wiki](https://github.com/mpv-player/mpv/wiki)
+* [FAQ](https://github.com/mpv-player/mpv/wiki/FAQ)
 * [Man pages](http://mpv.io/manual/master/)
 * [Contact](#contact)
 * [License](#license)
@@ -47,6 +49,20 @@ Releases can be found on the [release list][releases].
 For semi-official builds and third-party packages please see
 [mpv.io](http://mpv.io/installation/).
 
+## Changelog
+
+
+There is no completely changelog, however changes to the player core interface
+are listed in the [interface changelog][interface-changes].
+
+Changes to the C API are documented in the [client API changelog][api-changes].
+
+The [release list][releases] has a summary of most of the important changes
+on every release.
+
+Changes to the default key bindings are inidcated in
+[restore-old-bindings.conf][restore-old-bindings].
+
 ## Compilation
 
 
@@ -197,7 +213,7 @@ In general, mpv should be considered a completely new program, rather than a
 MPlayer drop-in replacement.
 
 If you are wondering what's different from mplayer2 and MPlayer, an incomplete
-list of changes is located [here][mplayer-changes].
+and now unmaintained list of changes is located [here][mplayer-changes].
 
 ## Contact
 
@@ -220,6 +236,9 @@ only if discretion is required.
 [release-policy]: https://github.com/mpv-player/mpv/blob/master/DOCS/release-policy.md
 [windows_compilation]: https://github.com/mpv-player/mpv/blob/master/DOCS/compile-windows.md
 [mplayer-changes]: https://github.com/mpv-player/mpv/blob/master/DOCS/mplayer-changes.rst
+[interface-changes]: https://github.com/mpv-player/mpv/blob/master/DOCS/interface-changes.rst
+[api-changes]: https://github.com/mpv-player/mpv/blob/master/DOCS/client-api-changes.rst
+[restore-old-bindings]: https://github.com/mpv-player/mpv/blob/master/etc/restore-old-bindings.conf
 
 ## License
 

TOOLS/appveyor-install.sh

@@ -29,7 +29,7 @@ pacman -S --noconfirm --needed \
     $MINGW_PACKAGE_PREFIX-libjpeg-turbo \
     $MINGW_PACKAGE_PREFIX-lua51 \
     $MINGW_PACKAGE_PREFIX-rubberband \
-    $MINGW_PACKAGE_PREFIX-uchardet-git
+    $MINGW_PACKAGE_PREFIX-uchardet
 
 # Delete unused packages to reduce space used in the Appveyor cache
 pacman -Sc --noconfirm