diff options
| author | Anton Kindestam <antonki@kth.se> | 2018-06-02 12:54:05 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2018-12-01 15:42:20 +0200 |
| commit | c151fae054d12ef9b392f5b6dcc1bafe894005b0 (patch) | |
| tree | 7897c815b81f2ad0ea9813d3b271ab45fe2277e1 /DOCS | |
| parent | b6a431ec55b1216dd89206dd38747482ec50075b (diff) | |
| download | mpv-c151fae054d12ef9b392f5b6dcc1bafe894005b0.tar.bz2 mpv-c151fae054d12ef9b392f5b6dcc1bafe894005b0.tar.xz | |
drm_atomic: Add general primary/overlay plane option
Add general primary/overlay plane option to drm-osd-plane-id and
drm-video-plane-id, so that the user can just request any usable
primary or overlay plane for either of these two options. This should
be somewhat more user-friendly (especially as neither of these two
options currently have a useful help function), as usually you would
only be interested in the type of the plane, and not exactly which
plane gets picked.
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/interface-changes.rst | 5 | ||||
| -rw-r--r-- | DOCS/man/vo.rst | 28 |
2 files changed, 20 insertions, 13 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 34d90447af..f7ed1597ab 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -20,6 +20,11 @@ Interface changes :: --- mpv 0.30.0 --- + - the `--drm-osd-plane-id` and `--drm-video-plane-id` + options now accept either an integer index, or the values primary or overlay. + `--drm-osd-plane-id` now defaults to primary and `--drm-video-plane-id` + defaults to overlay. This should be similar to previous behavior on most drivers + due to how planes are usually sorted. - rename --opensles-frames-per-buffer to --opensles-frames-per-enqueue to better reflect its purpose. In the past it overrides the buffer size the AO requests (but not the default/value of the generic --audio-buffer option). diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index ccde336264..a3cc328b1d 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -488,19 +488,21 @@ Available video output drivers are: Mode ID to use (resolution and frame rate). (default: 0) - ``--drm-osd-plane-id=<number>`` - Select the DRM plane index to use for OSD (or OSD and video). - Index is zero based, and related to crtc. - When using this option with the drm_prime renderer, it will only affect - the OSD contents. Otherwise it will set OSD & video plane. - (default: primary plane) - - ``--drm-video-plane-id=<number>`` - Select the DRM plane index to use for video layer. - Index is zero based, and related to crtc. - This option only has effect when using the drm_prime renderer (which - supports several layers) together with ``vo=gpu`` and ``gpu-context=drm``. - (default: first overlay plane) + ``--drm-osd-plane-id=<primary|overlay|N>`` + Select the DRM plane to use for OSD (or OSD and video). The plane can be + specified as ``primary``, which will pick the first applicable primary + plane; ``overlay``, which will pick the first applicable overlay plane; + or by index. The index is zero based, and related to the CRTC. When using + this option with the drm_prime renderer, it will only affect the OSD + contents. Otherwise it will set OSD & video plane. + (default: primary) + + ``--drm-video-plane-id=<primary|overlay|N>`` + Select the DRM plane index to use for video layer. This option accepts + the same values as ``--drm-osd-plane-id``. This option has an effect + only when using the drm_prime renderer (which supports several layers) + together with ``vo=gpu`` and ``gpu-context=drm``. + (default: overlay) ``--drm-format=<xrgb8888|xrgb2101010>`` Select the DRM format to use (default: xrgb8888). This allows you to |