From patchwork Tue Nov 28 04:42:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 44836 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp3935084pzb; Mon, 27 Nov 2023 20:42:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IG0IUtFSpJ932Fmqq2LU1IWxKoU/gqoPYzFod0/rgCeugPUnPo0IUEu9M3LX502HCB7p6kV X-Received: by 2002:a05:651c:333:b0:2c9:a197:4202 with SMTP id b19-20020a05651c033300b002c9a1974202mr3487885ljp.46.1701146573477; Mon, 27 Nov 2023 20:42:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701146573; cv=none; d=google.com; s=arc-20160816; b=WGsF/+uYi7kxoXfEEPE+sqxPRRl/3W/kln3kDsHHn6cIBVZzdFoDEEA5MscxBvFCYm JZzJ/VduJDgI4ca9agRYRjvG4pE8/8ve+f0UrQOSvkyU3yGr3/wegYUMCqYtlGk+cE90 cHByl2U4tx6hX3uxU2Pfo5MdyVDGC0QDp83s/WSDk1FQ6bNnPSrL8lEyxUoq3/O/RzCz +UoiLHC/Ia43AU/ozbDIBHg2gd1ZcLApMQB5JF7w8hUZGc1GiFcbF1veUlvCrab1wENV XpiVKHaoWIWVNXe0ixegGThDXq3FDudTp2ah0jIlOL/xWW4d8gSvNxyvVjAqTwzF3Ygs C0cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=pliZsAyy+1gxzG9WBzsI31STZRum3pHz2ktuABm2ogM=; fh=JVwoKitmDMglBIDNsFegDtZzf8dtFDpg13pNAFhv/r4=; b=Kz+2fSqVZkO4G+LGK+9w8F1DWAhn3eX+51derZlhrUjOIIHJoGuHM7XA/1ngnaitiw XUdDaUDPhBT1JeRKeRlR5UzyPHxORl5ZTY/j2/d31/1yr/h+S/6K0HpA/QkB9nvAjdCE mUdEtzW37qCbr/qI+LrlmXjykaDO8oNtPB9EM/ZYo2haBUsE9bCG1tyVZKA9vzXb15f2 y6EAuN3mZoL46ri2dVH/aDSAAABa3FzDzbztgiVx/rjvFPOvfrhDdsofE5xIJQp03jW/ Gwg5hDI6NmK1jCvK0cKCvDnUgOavJqmz7b9Uf8c+f0yqcrGoz5dBmP0s33e0FXQbLmJw G1bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Rt9H3h3U; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ss18-20020a170907039200b00a0006e5966esi5420643ejb.569.2023.11.27.20.42.52; Mon, 27 Nov 2023 20:42:53 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Rt9H3h3U; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 404F968CF95; Tue, 28 Nov 2023 06:42:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E83DB68CA50 for ; Tue, 28 Nov 2023 06:42:41 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701146567; x=1732682567; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=sd1Zf5/G5bz23BqJ+UiEFE6vqHh1OYRQel3W+9/6eM8=; b=Rt9H3h3UlYwGuu2w2JX8pf2ePI/FP/GUMS71e20e351vegPeZFV5MydP c91Gb8xus/6FscQ7qh3yMWQrDrYpcVvsyvxc5X0V8lnAXv4FKYUGNkZlx 13LWfMSgav4EssJhdfyAYMhcK0PGikX/pHblS0Aaij9cJ7J1lG1uIuocu UZGS+6k7ETZMAUOfV6lXmCgsjfEkl/+8RHlt46iVPltAy2YVCgsVOjOTE cmLzNnweYL3rNHriM+0GZcTRj1R4HBBppLsWfZ0cne/GTVY3x7GRSxHF9 e6gNz7E5hUSV7jkJ52eMGfok2TNtmv+3y4L+TFefDaGpZMrOgMOrdzh9l w==; X-IronPort-AV: E=McAfee;i="6600,9927,10907"; a="6103472" X-IronPort-AV: E=Sophos;i="6.04,232,1695711600"; d="scan'208";a="6103472" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2023 20:42:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10907"; a="1015797401" X-IronPort-AV: E=Sophos;i="6.04,232,1695711600"; d="scan'208";a="1015797401" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2023 20:42:36 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Nov 2023 12:42:25 +0800 Message-Id: <20231128044227.2440476-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] lavu/hwcontext_d3d11va: Add option vendor_id 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 Cc: Haihao Xiang , Artem Galin Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0VGoEuxWN/jH From: Artem Galin User may choose the hardware via option vendor_id when multiple hardwares are available. Signed-off-by: Artem Galin Signed-off-by: Haihao Xiang --- libavutil/hwcontext_d3d11va.c | 59 ++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index cc8c97d2b6..2fd3561c88 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -552,6 +552,47 @@ static void d3d11va_device_uninit(AVHWDeviceContext *hwdev) } } +static int d3d11va_device_find_adapter_by_vendor_id(AVHWDeviceContext *ctx, uint32_t flags, const char *vendor_id) +{ + HRESULT hr; + IDXGIAdapter *adapter = NULL; + IDXGIFactory2 *factory; + int adapter_id = 0; + long int id = strtol(vendor_id, NULL, 0); + + hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&factory); + if (FAILED(hr)) { + av_log(ctx, AV_LOG_ERROR, "CreateDXGIFactory returned error\n"); + return -1; + } + + while (IDXGIFactory2_EnumAdapters(factory, adapter_id++, &adapter) != DXGI_ERROR_NOT_FOUND) { + ID3D11Device* device = NULL; + DXGI_ADAPTER_DESC adapter_desc; + + hr = mD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, NULL, 0, D3D11_SDK_VERSION, &device, NULL, NULL); + if (FAILED(hr)) { + av_log(ctx, AV_LOG_DEBUG, "D3D11CreateDevice returned error, try next adapter\n"); + IDXGIAdapter_Release(adapter); + continue; + } + + hr = IDXGIAdapter2_GetDesc(adapter, &adapter_desc); + ID3D11Device_Release(device); + IDXGIAdapter_Release(adapter); + if (FAILED(hr)) { + av_log(ctx, AV_LOG_DEBUG, "IDXGIAdapter2_GetDesc returned error, try next adapter\n"); + continue; + } else if (adapter_desc.VendorId == id) { + IDXGIFactory2_Release(factory); + return adapter_id - 1; + } + } + + IDXGIFactory2_Release(factory); + return -1; +} + static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device, AVDictionary *opts, int flags) { @@ -563,6 +604,7 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device, UINT creationFlags = D3D11_CREATE_DEVICE_VIDEO_SUPPORT; int is_debug = !!av_dict_get(opts, "debug", NULL, 0); int ret; + int adapter = -1; // (On UWP we can't check this.) #if !HAVE_UWP @@ -581,10 +623,25 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device, } if (device) { + adapter = atoi(device); + } else { + AVDictionaryEntry *e = av_dict_get(opts, "vendor_id", NULL, 0); + if (e && e->value) { + adapter = d3d11va_device_find_adapter_by_vendor_id(ctx, creationFlags, e->value); + if (adapter < 0) { + av_log(ctx, AV_LOG_ERROR, "Failed to find d3d11va adapter by " + "vendor id %s\n", e->value); + return AVERROR_UNKNOWN; + } + } + } + + if (adapter >= 0) { IDXGIFactory2 *pDXGIFactory; + + av_log(ctx, AV_LOG_VERBOSE, "Selecting d3d11va adapter %d\n", adapter); hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&pDXGIFactory); if (SUCCEEDED(hr)) { - int adapter = atoi(device); if (FAILED(IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter, &pAdapter))) pAdapter = NULL; IDXGIFactory2_Release(pDXGIFactory);