[FFmpeg-devel] [PATCH v3 2/3] Update -device argument usage in VAAPI documentation to indicate now also DirectX Adapter indices are supported.
Sil Vilerino
sivileri at microsoft.com
Wed Apr 12 15:27:40 EEST 2023
Initial review at https://github.com/intel-media-ci/ffmpeg/pull/619/
Reviewed-by: Dmitry Rogozhkin <dmitry.v.rogozhkin at intel.com>
Reviewed-by: Wu, Tong1 <tong1.wu at intel.com>
---
doc/ffmpeg.texi | 5 +++--
fftools/ffmpeg_opt.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index d433d60ce9..a79a9a694d 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1171,9 +1171,10 @@ Choose the first device and use the primary device context.
@var{device} is the number of the Direct3D 11 display adapter.
@item vaapi
- at var{device} is either an X11 display name or a DRM render node.
+ at var{device} is either an X11 display name, a DRM render node or a DirectX adapter index.
If not specified, it will attempt to open the default X11 display (@emph{$DISPLAY})
-and then the first DRM render node (@emph{/dev/dri/renderD128}).
+and then the first DRM render node (@emph{/dev/dri/renderD128}), or the default
+DirectX adapter on Windows.
@item vdpau
@var{device} is an X11 display name.
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 055275d813..043cf539a5 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -1758,7 +1758,7 @@ const OptionDef options[] = {
#if CONFIG_VAAPI
{ "vaapi_device", HAS_ARG | OPT_EXPERT, { .func_arg = opt_vaapi_device },
- "set VAAPI hardware device (DRM path or X11 display name)", "device" },
+ "set VAAPI hardware device (DirectX adapter index, DRM path or X11 display name)", "device" },
#endif
#if CONFIG_QSV
--
2.39.2.vfs.0.0
More information about the ffmpeg-devel
mailing list