From patchwork Thu Mar 14 21:26:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 47064 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp719419pzb; Thu, 14 Mar 2024 14:27:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVb9NuXne65FSCYoKhyqlvEr6msnuq0+SGVmCeTeIyHsHN4Bw30uY3MQ+p6xkNHS2BDyrDwuFEbOxTjlgprlwMRXw4N1M0Png17Rg== X-Google-Smtp-Source: AGHT+IG4FfZIC4uqoh6152sQraQygxcmPsiv/d1Gp/LHVzNQOznD7XgC7QwrH+NkzoIxUzGgkemX X-Received: by 2002:a05:6402:194c:b0:568:99f8:1999 with SMTP id f12-20020a056402194c00b0056899f81999mr2048623edz.11.1710451623264; Thu, 14 Mar 2024 14:27:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710451623; cv=none; d=google.com; s=arc-20160816; b=BAkF61IrGKMa5eTLAx74foEhtoGE23E/SL6GprRCX+c1mcUltw+0CQ6k9Nt5o5AaDn EK77LOQtOw8KJS56goBIYjv1oBZEizIi+1ksgP0yS+cr686chic3Udtr9KenKgKH2hN9 VjZJ9zLv8mdTFidassLlQIKRgkkcSFnD+r1xWxf26xx/e0rlGxajFppJbfqx2vsLYhY2 PHuNUi46h3QFkXuRb27dc7DI+/jOvSD1Ee4/XkWO+sOh76pfgEBvMmjTcDvCVaPdUKmh To7ep/2J+iRYN0doZ+jWoCTUmB0NofM7pKjNKD8EEUH0K9kpAUxdE9gLpAQLq8jE2zsW 5bJg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=UYGSXhYQKPsMETjPWSCCsmDpktMcSz0adcUMjoatPXQ=; fh=LnlYe9qYwgML7nWWXqAumr7YCmPjjpEPjQf6GasgJC0=; b=zxeuLxJ51CxqceW5P3BzLLNxfq1sIaghI2Te7HP9YuDyGBJpPpDVnyfKkAAlwvjHpG qC8a2LINFepPTtfjB81F5VFJ32Jna+pKs4+3sJaZFKI6G2gF24L0/bCgEqWBhQzOiZv9 x/2bso4il39Xlk60Z7inI5uGL13LKx5p4at4HnxjfLz/WjPW/tT+CLlDMylgDOt7Njd6 EUy0wCCFFmbkAvnNm66XLH16rvmbuBeze+oQE4R2+VC6HP4GYplKOFKq2mNUTHZ2MWjk X6nJAOChcSwucLKq+KuzYiZvbzILwNVq322rsaY2DOeRtZKp6T5DXzDa/HvIORcMe/O3 2GKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=q1CbFFjJ; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f21-20020a056402195500b0056844e1cb42si1133178edz.482.2024.03.14.14.27.02; Thu, 14 Mar 2024 14:27:03 -0700 (PDT) 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=@rothenpieler.org header.s=mail header.b=q1CbFFjJ; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED41168D180; Thu, 14 Mar 2024 23:26:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [144.76.60.213]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81E5368D131 for ; Thu, 14 Mar 2024 23:26:45 +0200 (EET) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id 0C36D281910BD; Thu, 14 Mar 2024 22:26:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1710451605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HSBCpaV80U4U7mCVtMXRZ0xNc4rZLWCkQasX8I+RW4k=; b=q1CbFFjJzkvZkRQqDIjVw5q+UNpRnPFewBHehPA+oqTUwe8oDzGwYozknqC6bjVc0X/eIt nuGnAuv2rghOJh7vtNvBNLM6BaDn/PBPwiuO7czmLk4i++mEHPH9w/8WSCdGueU8t22fSh ajbJNCITAR3nxrDYFUCU7ZH+ccFLx2p7Fx947J39SCiIonSKy+GJaNDrmlmv+p92b3jOTd V9rPqrH8TIGyZ0Skjlgg5t90zzeS1TP1l91xxFPFfhQjIXp62KSYN8+vqJI3P+bF+H2Jq6 R8K97djwni4SGFivo2L/YmD/aat6FVZMou1Y3CncD82QenH7BPIZC4GjwGyopg== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 22:26:32 +0100 Message-Id: <20240314212633.2736-2-timo@rothenpieler.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240314212633.2736-1-timo@rothenpieler.org> References: <20240314212633.2736-1-timo@rothenpieler.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avutil/hwcontext_d3d11va: prefer DXGI 1.1 factory when available 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: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wiE3cZL1bOL3 A lot of modern stuff straight up fails on the old 1.0 factory, which is masked by the fact that it's only used when an explicit adapter is specified. --- libavutil/hwcontext_d3d11va.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index a45e53595d..1b96c38d25 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -62,7 +62,9 @@ static av_cold void load_functions(void) return; mD3D11CreateDevice = (PFN_D3D11_CREATE_DEVICE) GetProcAddress(d3dlib, "D3D11CreateDevice"); - mCreateDXGIFactory = (PFN_CREATE_DXGI_FACTORY) GetProcAddress(dxgilib, "CreateDXGIFactory"); + mCreateDXGIFactory = (PFN_CREATE_DXGI_FACTORY) GetProcAddress(dxgilib, "CreateDXGIFactory1"); + if (!mCreateDXGIFactory) + mCreateDXGIFactory = (PFN_CREATE_DXGI_FACTORY) GetProcAddress(dxgilib, "CreateDXGIFactory"); #else // In UWP (which lacks LoadLibrary), CreateDXGIFactory isn't available, // only CreateDXGIFactory1