Merge branch 'master' into plex-htpc-hdr-patches

.github/workflows/build.yml

@@ -79,6 +79,7 @@ jobs:
         os:
           - "macos-11"
           - "macos-12"
+          - "macos-13"
     steps:
       - uses: actions/checkout@v3
 
@@ -90,7 +91,7 @@ jobs:
       - name: Install dependencies
         run: |
           brew update
-          brew install autoconf automake pkg-config libtool python freetype fribidi little-cms2 [email protected] libass ffmpeg meson
+          brew install autoconf automake pkg-config libtool python freetype fribidi little-cms2 [email protected] libass ffmpeg meson libplacebo
 
       - name: Build with meson
         id: build

.github/workflows/comment.yml

@@ -0,0 +1,58 @@
+name: comment
+
+on:
+  workflow_run:
+    workflows: ["build"]
+    types: [completed]
+
+jobs:
+  pr_comment:
+    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v6
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const run_id = ${{ github.event.workflow_run.id }};
+            const pull_head_sha = '${{github.event.workflow_run.head_sha}}';
+
+            const issue_number = await(async () => {
+              const pulls = await github.rest.pulls.list({ owner, repo });
+              for await (const { data } of github.paginate.iterator(pulls)) {
+                for (const pull of data) {
+                  if (pull.head.sha === pull_head_sha) {
+                    return pull.number;
+                  }
+                }
+              }
+            })();
+            if (issue_number) {
+              core.info(`Using pull request ${issue_number}`);
+            } else {
+              return core.error(`No matching pull request found`);
+            }
+
+            const { data: { artifacts } } = await github.rest.actions.listWorkflowRunArtifacts({ owner, repo, run_id });
+            if (!artifacts.length) {
+              return core.error(`No artifacts found`);
+            }
+
+            let body = `Download the artifacts for this pull request:\n\n<details><summary>Windows</summary>\n`;
+            for (const art of artifacts) {
+              const art_link = `https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip`;
+              if (art.name.includes('w64')) {
+                body += `\n* [${art.name}](${art_link})`;
+              }
+            }
+            body += `\n</details>`;
+
+            const { data: comments } = await github.rest.issues.listComments({ repo, owner, issue_number });
+            const existing_comment = comments.find((c) => c.user.login === 'github-actions[bot]');
+            if (existing_comment) {
+              core.info(`Updating comment ${existing_comment.id}`);
+              await github.rest.issues.updateComment({ repo, owner, comment_id: existing_comment.id, body });
+            } else {
+              core.info(`Creating a comment`);
+              await github.rest.issues.createComment({ repo, owner, issue_number, body });
+            }

DOCS/interface-changes.rst

@@ -63,6 +63,33 @@ Interface changes
     - remove `bcspline` filter (`bicubic` is now the same as `bcspline`)
     - rename `--cache-dir` and `--cache-unlink-files` to `--demuxer-cache-dir` and
       `--demuxer-cache-unlink-files`
+    - enable `--correct-downscaling`, `--linear-downscaling`, `--sigmoid-upscaling`
+    - `--cscale` defaults to `--scale` if not defined
+    - change `--tscale` default to `oversample`
+    - change `--dither-depth` to `auto`
+    - deprecate `--profile=gpu-hq`, add `--profile=<fast|high-quality>`
+    - change `--dscale` default to `hermite`
+    - update defaults to `--hdr-peak-decay-rate=20`, `--hdr-scene-threshold-low=1.0`,
+      `--hdr-scene-threshold-high=3.0`
+    - update defaults to `--deband-threshold=48`, `--deband-grain=32`
+    - add `--directory-mode=auto` and make it the default
+    - remove deprecated `--profile=opengl-hq`
+    - remove several legacy fallbacks for old deprecated options (now they will just
+      error out like normal)
+    - remove deprecated `drop-frame-count` and `vo-drop-frame-count` property aliases
+    - remove the ability to write to the `display-fps` property (use `override-display-fps`
+      instead)
+    - writing the current value to playlist-pos will no longer restart playback (use
+      `playlist-play-index` instead)
+    - remove deprecated `--oaoffset`, `--oafirst`, `--ovoffset`, `--ovfirst`,
+      `--demuxer-force-retry-on-eof`, `--fit-border` options
+    - remove deprecated `--record-file` option
+    - remove deprecated `--vf-defaults` and `--af-defaults` options
+    - `--drm-connector` no longer allows selecting the card number (use `--drm-device`
+      instead)
+    - add `--title-bar` option
+    - add `--window-corners` option
+    - rename `--cdrom-device` to `--cdda-device`
  --- mpv 0.36.0 ---
     - add `--target-contrast`
     - Target luminance value is now also applied when ICC profile is used.

DOCS/man/af.rst

@@ -19,8 +19,8 @@ syntax is:
     The ``--vf`` description describes how libavfilter can be used and how to
     workaround deprecated mpv filters.
 
-See ``--vf`` group of options for info on how ``--af-defaults``, ``--af-add``,
-``--af-pre``, ``--af-del``, ``--af-clr``, and possibly others work.
+See ``--vf`` group of options for info on how ``--af-add``, ``--af-pre``,
+``--af-del``, ``--af-clr``, and possibly others work.
 
 Available filters are:
 

DOCS/man/encode.rst

@@ -28,10 +28,6 @@ You can encode files from one format/codec to another using this facility.
     Specifies the output audio codec. See ``--oac=help`` for a full list of
     supported codecs.
 
-``--oaoffset=<value>``
-    Shifts audio data by the given time (in seconds) by adding/removing
-    samples at the start. Deprecated.
-
 ``--oacopts=<options>``
     Specifies the output audio codec options for libavcodec.
     See ``--oacopts=help`` for a full list of supported options.
@@ -50,18 +46,10 @@ You can encode files from one format/codec to another using this facility.
     ``--oacopts=""``
         Completely empties the options list.
 
-``--oafirst``
-    Force the audio stream to become the first stream in the output.
-    By default, the order is unspecified. Deprecated.
-
 ``--ovc=<codec>``
     Specifies the output video codec. See ``--ovc=help`` for a full list of
     supported codecs.
 
-``--ovoffset=<value>``
-    Shifts video data by the given time (in seconds) by shifting the pts
-    values. Deprecated.
-
 ``--ovcopts=<options>``
     Specifies the output video codec options for libavcodec.
     See --ovcopts=help for a full list of supported options.
@@ -83,10 +71,6 @@ You can encode files from one format/codec to another using this facility.
     ``--ovcopts=""``
         Completely empties the options list.
 
-``--ovfirst``
-    Force the video stream to become the first stream in the output.
-    By default, the order is unspecified. Deprecated.
-
 ``--orawts``
     Copies input pts to the output video (not supported by some output
     container formats, e.g. AVI). In this mode, discontinuities are not fixed

DOCS/man/input.rst

@@ -1939,13 +1939,9 @@ Property list
     situations, e.g. when video packets are damaged, or the decoder doesn't
     follow the usual rules. Unavailable if video is disabled.
 
-    ``drop-frame-count`` is a deprecated alias.
-
 ``frame-drop-count``
     Frames dropped by VO (when using ``--framedrop=vo``).
 
-    ``vo-drop-frame-count`` is a deprecated alias.
-
 ``mistimed-frame-count``
     Number of video frames that were not timed correctly in display-sync mode
     for the sake of keeping A/V sync. This does not include external
@@ -2645,11 +2641,6 @@ Property list
     available on all platforms. Note that any of the listed facts may change
     any time without a warning.
 
-    Writing to this property is deprecated. It has the same effect as writing to
-    ``override-display-fps``. Since mpv 0.31.0, this property is unavailable
-    if no display FPS was reported (e.g. if no video is active), while in older
-    versions, it returned the ``--display-fps`` option value.
-
 ``estimated-display-fps``
     The actual rate at which display refreshes seem to occur, measured by
     system time. Only available if display-sync mode (as selected by
@@ -2781,10 +2772,9 @@ Property list
     (Before mpv 0.33.0, instead of returning -1, this property was unavailable
     if no playlist entry was current.)
 
-    Writing the current value back to the property is subject to change.
-    Currently, it will restart playback of the playlist entry. But in the
-    future, writing the current value will be ignored. Use the
-    ``playlist-play-index`` command to get guaranteed behavior.
+    Writing the current value back to the property will have no effect.
+    Use ``playlist-play-index`` to restart the playback of the current entry if
+    desired.
 
 ``playlist-pos-1`` (RW)
     Same as ``playlist-pos``, but 1-based.

DOCS/man/libmpv.rst

@@ -21,15 +21,15 @@ C PLUGINS
 You can write C plugins for mpv. These use the libmpv API, although they do not
 use the libmpv library itself.
 
-They are available on Linux/BSD platforms only and enabled by default if the
-compiler supports linking with the ``-rdynamic`` flag.
+They are enabled by default if compiler supports linking with the ``-rdynamic``
+flag on Linux/BSD platforms. On Windows the are always enabled.
 
 C plugins location
 ------------------
 
 C plugins are put into the mpv scripts directory in its config directory
-(see the `FILES`_ section for details). They must have a ``.so`` file extension.
-They can also be explicitly loaded with the ``--script`` option.
+(see the `FILES`_ section for details). They must have a ``.so`` or ``.dll``
+file extension. They can also be explicitly loaded with the ``--script`` option.
 
 API
 ---
@@ -67,6 +67,10 @@ The current implementation requires that your plugins are **not** linked against
 libmpv. What your plugins use are not symbols from a libmpv binary, but
 symbols from the mpv host binary.
 
+On Windows to make symbols from the host binary available, you have to define
+MPV_CPLUGIN_DYNAMIC_SYM when compiling cplugin. This will load symbols
+dynamically, before calling ``mpv_open_cplugin()``.
+
 Examples
 --------
 

DOCS/man/mpv.rst

@@ -716,7 +716,7 @@ or at runtime with the ``apply-profile <name>`` command.
         [slow]
         profile-desc="some profile name"
         # reference a builtin profile
-        profile=gpu-hq
+        profile=high-quality
 
         [fast]
         vo=vdpau