From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4695245E46 for ; Wed, 12 Apr 2023 12:27:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E73268ABBC; Wed, 12 Apr 2023 15:27:55 +0300 (EEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C478668AA37 for ; Wed, 12 Apr 2023 15:27:48 +0300 (EEST) Received: from gem-name-lb-02.localdomain (pool-108-28-73-40.washdc.fios.verizon.net [108.28.73.40]) by linux.microsoft.com (Postfix) with ESMTPSA id 7F8C821779BC for ; Wed, 12 Apr 2023 05:27:47 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 7F8C821779BC From: Sil Vilerino To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Apr 2023 08:27:40 -0400 Message-Id: <20230412122741.474-2-sivileri@microsoft.com> X-Mailer: git-send-email 2.39.2.vfs.0.0 In-Reply-To: <20230412122741.474-1-sivileri@microsoft.com> References: <20230412122741.474-1-sivileri@microsoft.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/3] Update -device argument usage in VAAPI documentation to indicate now also DirectX Adapter indices are supported. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Initial review at https://github.com/intel-media-ci/ffmpeg/pull/619/ Reviewed-by: Dmitry Rogozhkin Reviewed-by: Wu, Tong1 --- 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 -@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. 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 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".