Skip to content

Commit f3c89cb

Browse files
author
nadeko
committed
CI autodeploy
1 parent f153f56 commit f3c89cb

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

manual/master/index.html

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2489,7 +2489,7 @@ <h2>Video</h2>
24892489
<tr class="field"><th class="field-name" colspan="2">videotoolbox-copy:</th></tr>
24902490
<tr class="field"><td>&nbsp;</td><td class="field-body">copies video back into system RAM (macOS 10.8 or iOS 9.0 and up)</td>
24912491
</tr>
2492-
<tr class="field"><th class="field-name">vaapi:</th><td class="field-body">requires <tt class="docutils literal"><span class="pre">--vo=gpu</span></tt>, <tt class="docutils literal"><span class="pre">--vo=vaapi</span></tt> or <tt class="docutils literal"><span class="pre">--vo=vaapi-wayland</span></tt> (Linux only)</td>
2492+
<tr class="field"><th class="field-name">vaapi:</th><td class="field-body">requires <tt class="docutils literal"><span class="pre">--vo=gpu</span></tt>, <tt class="docutils literal"><span class="pre">--vo=vaapi</span></tt> or <tt class="docutils literal"><span class="pre">--vo=dmabuf-wayland</span></tt> (Linux only)</td>
24932493
</tr>
24942494
<tr class="field"><th class="field-name">vaapi-copy:</th><td class="field-body">copies video back into system RAM (Linux with some GPUs only)</td>
24952495
</tr>
@@ -7088,6 +7088,8 @@ <h2>GPU renderer options</h2>
70887088
<dd>X11/EGL</dd>
70897089
<dt>android</dt>
70907090
<dd>Android/EGL. Requires <tt class="docutils literal"><span class="pre">--wid</span></tt> be set to an <tt class="docutils literal">android.view.Surface</tt>.</dd>
7091+
<dt>wldmabuf</dt>
7092+
<dd>dmabuf buffers are rendered directly by Wayland compositor</dd>
70917093
</dl>
70927094
</dd>
70937095
<dt><tt class="docutils literal"><span class="pre">--gpu-api=&lt;type&gt;</span></tt></dt>
@@ -7101,6 +7103,9 @@ <h2>GPU renderer options</h2>
71017103
<dd>Allow only Vulkan (requires a valid/working <tt class="docutils literal"><span class="pre">--spirv-compiler</span></tt>)</dd>
71027104
<dt>d3d11</dt>
71037105
<dd>Allow only <tt class="docutils literal"><span class="pre">--gpu-context=d3d11</span></tt></dd>
7106+
<dt>none</dt>
7107+
<dd>No graphics API is used - Wayland alone is used for rendering
7108+
(requires Wayland compositor)</dd>
71047109
</dl>
71057110
</dd>
71067111
<dt><tt class="docutils literal"><span class="pre">--opengl-es=&lt;mode&gt;</span></tt></dt>
@@ -8489,12 +8494,13 @@ <h1>VIDEO OUTPUT DRIVERS</h1>
84898494
<dd>Instruct SDL to switch the monitor video mode when going fullscreen.</dd>
84908495
</dl>
84918496
</dd>
8492-
<dt><tt class="docutils literal"><span class="pre">vaapi-wayland</span></tt></dt>
8493-
<dd>Experimental Wayland output driver designed for use with VA API hardware decoding.
8494-
The driver is designed to avoid any GPU to CPU copies, and to perform scaling and
8495-
color space conversion using fixed-function hardware, if available,
8496-
rather than GPU shaders. This frees up GPU resources for other tasks.
8497-
Currently this driver is experimental and only works with the <tt class="docutils literal"><span class="pre">--hwdec=vaapi</span></tt> driver;
8497+
<dt><tt class="docutils literal"><span class="pre">dmabuf-wayland</span></tt></dt>
8498+
<dd>Experimental Wayland output driver designed for use with either drm stateless
8499+
or VA API hardware decoding. The driver is designed to avoid any GPU to CPU copies,
8500+
and to perform scaling and color space conversion using fixed-function hardware,
8501+
if available, rather than GPU shaders. This frees up GPU resources for other tasks.
8502+
Currently this driver is experimental and only works with the <tt class="docutils literal"><span class="pre">--hwdec=vaapi</span></tt>
8503+
or <tt class="docutils literal">hwdec=drm</tt> drivers;
84988504
OSD is also not supported. Supported compositors : Weston and Sway.</dd>
84998505
<dt><tt class="docutils literal">vaapi</tt></dt>
85008506
<dd><p class="first">Intel VA API video output driver with support for hardware decoding. Note

0 commit comments

Comments
 (0)