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 14EB545EAA for ; Fri, 14 Apr 2023 14:39:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5307868BEA0; Fri, 14 Apr 2023 17:39:22 +0300 (EEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 354D368BE2D for ; Fri, 14 Apr 2023 17:39:15 +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 1A853217A941 for ; Fri, 14 Apr 2023 07:39:14 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 1A853217A941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1681483154; bh=/dpbgcAuyegejR5D5MPy/KlrSYjQa9ZTOMbN8opX20I=; h=From:To:Subject:Date:In-Reply-To:References:From; b=qghc9h8WhMl5DZu7rXbQiFODPqvA7ccYypQIjGSbc4vHUNnprmps/L03hWH6/+e81 /g5fJRAUA/C5RAO+QemvwSGDfo6YBTTCP1n/pZi48FmJ5IzNdVRPh9xpEl8kJnZN2r Qq16Lm/nS9VShEGyopVchhRajouhyjih4eWQK2EM= From: Sil Vilerino To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Apr 2023 10:39:05 -0400 Message-Id: <20230414143906.1582-2-sivileri@linux.microsoft.com> X-Mailer: git-send-email 2.39.2.vfs.0.0 In-Reply-To: <20230414143906.1582-1-sivileri@linux.microsoft.com> References: <20230414143906.1582-1-sivileri@linux.microsoft.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/3] fftools/ffmpeg_opt: Document VAAPI -device usage for DirectX Adapter 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: From: Sil Vilerino Initial review at https://github.com/intel-media-ci/ffmpeg/pull/619/ Signed-off-by: Sil Vilerino 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 cb8aa13df2..34c413355e 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -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. diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index aa9aa0e9b4..f811d38b9c 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -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 -- 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".