Skip to content

Commit

Permalink
fftools/ffmpeg_opt: Document VAAPI -device usage for DirectX Adapter
Browse files Browse the repository at this point in the history
Initial review at intel-media-ci#619

Signed-off-by: Sil Vilerino <sivileri@microsoft.com>
Reviewed-by: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
Reviewed-by: Wu, Tong1 <tong1.wu@intel.com>
  • Loading branch information
sivileri committed Apr 14, 2023
1 parent 3011073 commit 548d770
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions doc/ffmpeg.texi
Original file line number Diff line number Diff line change
Expand Up @@ -1169,9 +1169,10 @@ Choose the first device and use the primary device context.
@var{device} is the number of the Direct3D 11 display adapter.

@item vaapi
@var{device} is either an X11 display name or a DRM render node.
@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.
Expand Down
2 changes: 1 addition & 1 deletion fftools/ffmpeg_opt.c
Original file line number Diff line number Diff line change
Expand Up @@ -1767,7 +1767,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
Expand Down

0 comments on commit 548d770

Please sign in to comment.