From patchwork Fri Nov 24 05:43:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 44781 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp1077170pzb; Thu, 23 Nov 2023 21:45:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IEm0HZANddaQJOObT67d68pZ72aqe47rQxdwjN5acb89+wShNU6fH7C+1Cqh0u4/YLkanOr X-Received: by 2002:a50:f68c:0:b0:540:1bc0:65b2 with SMTP id d12-20020a50f68c000000b005401bc065b2mr1071272edn.10.1700804700528; Thu, 23 Nov 2023 21:45:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700804700; cv=none; d=google.com; s=arc-20160816; b=A6PpvFQzvwYCAcVDmDGbyv56we21pj1XKptWhrC6ajZHj5zr72r8cip8gOZ82GJdbm k0+lT+mJmHGhfFOh8YLZD0fr1Xp8P9O6k9W0m/nPWianZZGymHFzNLeZ/OQi+fSRdjQF j3O8OZFW06AF0si614XBGtE6D4Z9dg0BgsWYuQrmgtlYbGUdEvPKXbHEHrVcqFp+Ycs8 hnBoIK9eAHwTx2a8k9Y5p8SHjXSiSSzEOSatPxGM8eGOSbW2YOhBmA8ROLWBPnszcPnD Z8sFYTdYZWFrRxrUm7RSW1deGjZ8dQe4q0yFYFMnRFS3bixrCm0JNi7SnUyvgg4chNym rwVg== 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=9bugFYTGb+XyVZdIgmL8qznUW7p6x3R1TBJ8Kq7yutc=; fh=JVwoKitmDMglBIDNsFegDtZzf8dtFDpg13pNAFhv/r4=; b=r3t4z8v38ztEgFxUXK5Smb5uKWtQyANLXM0Z2IDMs2ItvTzwFBRcXLLAoYs48JjcSW 9gW2PxtZ79npdPidN9RqEwLZelpsHdj2yWmD8+yrDwDmpRB4s7u3YUuorHwoXT572M3k C/0zn5jw678Q3+br1+FC4RurVpGt3V6t+PpGZz5Ou5pjzNwUXU4okvkSS05ykWxSE1jd DikoTV2ZTyHbBwyKBxkmYx5cGf3nezuHTMHqAu8zaVpuFzRb1MSvBYOog6zLX+nnsGH7 Gaot3gbmA0SUWIYXKxVknD9yDGnX462xcS8jPr5Ueyprp+Itol9/rjverII+2YeZGwOq CDWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=JJI2JA2K; 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 m18-20020a509312000000b0054af2b698edsi477304eda.193.2023.11.23.21.44.53; Thu, 23 Nov 2023 21:45:00 -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=JJI2JA2K; 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 2EF1968CF10; Fri, 24 Nov 2023 07:44:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C55D68CA2D for ; Fri, 24 Nov 2023 07:44: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=1700804686; x=1732340686; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=u+ip3xeBfWgIA2Xf5kzkpMLBJok/WUZFUNyQV3axCko=; b=JJI2JA2KV3boRvdUkd6lP0/gB995nZWRTuOQbdVWxn1oAddrK94RxufV 0tA6XGbkoI+fuRIjBL8UmKdaPUhO3OVMGLPUJabS48/T4ujbA3oouuQgq rzNcVhDae+tXNpaiHIXVVMhfscZjw0Kc9dZJC4RVXAk+riSOh/IVswJ7v kRdtpwkcX0BThaBXdkF59vz9gjSCoVayjzaNvGNJtFfIY900yDtmfnBvG DyMGRiu83RIZyRyHbG5IvYaBR3Q60D1KVRtqGcXBZc7qpxh6AL+Md4OvS 3wLHoR1HPWbSKDoOK/cwMq3Ug+h/Pn5pWuGpEsE6wRSvgQVHXcJBJLvK0 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="458858896" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="458858896" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 21:44:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="890977566" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="890977566" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 21:44:36 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Nov 2023 13:43:46 +0800 Message-Id: <20231124054348.3115276-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: 2P3qUnRL0cdR From: Artem Galin User may choose the hardware via option vendor_id when multiple hardware are available. Signed-off-by: Artem Galin Signed-off-by: Haihao Xiang --- libavutil/hwcontext_d3d11va.c | 67 ++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index cc8c97d2b6..a6777b70a1 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -552,6 +552,55 @@ 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_ERROR, "D3D11CreateDevice returned error\n"); + + if (adapter) + IDXGIAdapter_Release(adapter); + + continue; + } + + hr = IDXGIAdapter2_GetDesc(adapter, &adapter_desc); + + if (device) + ID3D11Device_Release(device); + + if (adapter) + IDXGIAdapter_Release(adapter); + + if (FAILED(hr)) { + av_log(ctx, AV_LOG_ERROR, "IDXGIAdapter2_GetDesc returned error\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 +612,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 +631,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);