From patchwork Tue Aug 8 17:52:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsO4Z2VyIEhhbnNlZ8OlcmQ=?= X-Patchwork-Id: 43188 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2450204pzh; Tue, 8 Aug 2023 10:52:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAdA6iMdFpEs3vUlqwVDkvQVIKklZ0rDn6UN3UAgbHrgJaevnWCGyfwJ+QL4zVadCtuhz6 X-Received: by 2002:a17:906:3284:b0:99c:ae35:8cd with SMTP id 4-20020a170906328400b0099cae3508cdmr271847ejw.43.1691517138995; Tue, 08 Aug 2023 10:52:18 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f1-20020a170906138100b00992e50eafcfsi6610964ejc.772.2023.08.08.10.52.18; Tue, 08 Aug 2023 10:52:18 -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=@qt.io header.s=selector2 header.b=aDyXLbuH; arc=fail (body hash mismatch); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=qt.io Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A270768C81A; Tue, 8 Aug 2023 20:52:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2128.outbound.protection.outlook.com [40.107.6.128]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62107680536 for ; Tue, 8 Aug 2023 20:52:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d+idYyPNM3m5wQ9wZIPrGIzdsL7FhOrDI72BGEwB4vq5MYmZW93x9PMsXF0twC1m5F85VvqCC1yJJB6q0foPg8f8rMUgT25VX4dOaPJqJ4y5SXLKfobTkFw+zKiSngx56oBCf0etqC6uFPa7rie/m4GkhmAIJBGuC4aXC2aOMWoj39sg78qfSmTJ9Ftg5vCO6C+lZUS5Rwzo39wsDWABUCobbft29F5PYWqAsbHS6gY2BfKadcziwivajidu5JGKN6sKe4r4tHbxQLcRD3H9572ETDvD0SSfh5DQfKv/m8I6OXbcFUSeFkz+8u9Hwofhpo6Lwq/KdCo7VyKj+ewBBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3WwREePoQGRt/Q4t91r+Gf2FKgBoS6YhmsMbPCEni8Q=; b=K0BTaREclUuXddh22Hv+CDtm5bLU7hQzQG8B62xWSItZKU1u3tf8TTJvuGnORrLS4YEgsa7idRaZNBj4RUpFxLS6lEdcGc8QynwS6XcbI9K0n4LUf4CxNFTvJQ3K1Pss0cWdGl5GIXMtdFFZ2VeBBXSo063WSa79c7B/jAK0HyqQrZw20v4TayaZToBKNZ8/Q+f2KTpg8WAPZaaBDQssvA1f4hjNubrGZTt4SbwU5l31UCUons0Kuy9PMp51gqDE008yWL+XrbT/6msNE67vUMQUM6P0B8WTpcXT0rcNxlmeRW+O6FKCaSBmuEWaUXAfYvvGFR3l57KtxUA2z1TQ6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=qt.io; dmarc=pass action=none header.from=qt.io; dkim=pass header.d=qt.io; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qt.io; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3WwREePoQGRt/Q4t91r+Gf2FKgBoS6YhmsMbPCEni8Q=; b=aDyXLbuHErnANOCLfVimEvC60lcdDyIZvLlmeciWYOAfKsVGyy0LXFh13BA6UzXjmErl1OMF1dv4ffjTiV4VGGK8bXlp4de1Xq1iHv0/+OzBGyx0oKhtC/xjkf1optgebe/vuYuTv7awTUhAzjmk7BfeYS8CO3OZrDeLyYhAIJo= Received: from AM6PR02MB4022.eurprd02.prod.outlook.com (2603:10a6:20b:42::19) by AS8PR02MB9743.eurprd02.prod.outlook.com (2603:10a6:20b:61d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 17:52:06 +0000 Received: from AM6PR02MB4022.eurprd02.prod.outlook.com ([fe80::9c8d:5a04:8208:8fba]) by AM6PR02MB4022.eurprd02.prod.outlook.com ([fe80::9c8d:5a04:8208:8fba%4]) with mapi id 15.20.6652.025; Tue, 8 Aug 2023 17:52:06 +0000 From: =?iso-8859-1?q?J=F8ger_Hanseg=E5rd?= To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] Fix failure to initialize ddagrab if adapter ID is specified Thread-Index: AdnKIHlfjwlwvagTQdCkZrGnPRa2dA== Date: Tue, 8 Aug 2023 17:52:06 +0000 Message-ID: Accept-Language: en-US, en-GB Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=qt.io; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AM6PR02MB4022:EE_|AS8PR02MB9743:EE_ x-ms-office365-filtering-correlation-id: 11100c28-d2bd-42be-ff2d-08db98382e61 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: o+c3penjkMYCKhX1RQRmiDxsfHcj0xGzPZjQo/YPOr/rrHDmccSurZ4Thtkz8SpjCtFlJgJzCPum9D9NR7/fc3x0IZOlRc8xoz2r+FfFYsOtT0/s7wg0oiEoHsXky2pXN1t7ct+eQjtsOJMBJOLPUQ4h7ZJp72f6zk8iML+UUFw+wqLfFP6VXpf3D9MfzaQxJR5QoDqivpNvGPi2t8RNSqQ+/P7DES0HLpqTkvwJc9the3NzIKb646t2JHwWyPEz0Q/RriiUOndZivUezgQq27w6uSIlcFZgdyw5l/ho+T93uni+rOk2LyLBj/3ct/EBJ9SEnenlADmexrB6OPBAz3bNVRVZ31EyhE3cm4CFxA9VJkSp7ApwePCvsxaLTOKsIzpAPfn+l9kCo61Mpf2A5iscpaYhOe7soQt05+5jLlGmfrzmj9mfZEiOUy1iqbWTCvNcvtrJhBGSqzqe9AD61BlEk9fQMjIw/R1H4Or99c1SYPmOX06JJycAYNAlHvuMLtuphUXpX1CWeN/z6aJmpHv1GitmbPBazOS3vGDHJGb0UDIEhFckOyLv88t486LexA+rXWfQ6sQDNwrcLLkO9dSgDNm3GuWdBLgAjINyQ5GVfqmjJ/vanFazaSfbATMF/W7hwE1lgaLjpdpkurQ4cQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR02MB4022.eurprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(39850400004)(366004)(346002)(376002)(136003)(451199021)(1800799003)(186006)(55016003)(19627405001)(166002)(9686003)(6916009)(316002)(86362001)(122000001)(76116006)(38100700002)(99936003)(66946007)(478600001)(71200400001)(66446008)(66556008)(33656002)(66476007)(7696005)(64756008)(6506007)(26005)(52536014)(38070700005)(66574015)(8676002)(8936002)(41300700001)(2906002)(83380400001)(5660300002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?A5+rtP0rFqL8En+8Z0rirfJ?= =?iso-8859-1?q?KzbJtE68tzp1sneLznEbukNZP1XRkT9akWgZNSDUnt44PmqhYGKvAp7twFUe?= =?iso-8859-1?q?NUGIGYdRmswLB11ZvW7qfU9wfZ3acDkQp6e4pC/oDgHiN8UVk00JGyrscxPz?= =?iso-8859-1?q?nw0yHnzc/hMrcPlSw6dCt0xH9cT2cTCgLEr4hF/nwF+oE7CBjAQf1iKQYnqz?= =?iso-8859-1?q?33MA5i4DO6G7v0YvV5kUdEQhenBK7rHFtGOx3KZcovFX2/TO8OH5N06txxpo?= =?iso-8859-1?q?sJFsMto51AGN4O1S7PxWC4luteFQok2hMCVaxJVfLFlVFSUOvVpPIE78zOfT?= =?iso-8859-1?q?fPmdIsiog+WIfUBhIac4rm7n6UVBUc4iG+Kxvq7ASrTpHKtSFzCN124Dj3GJ?= =?iso-8859-1?q?pGEGpiSqPPR3gMFr7vD3up3sqF8JCW31S+BgVPKqlfBHOrlfNEghB5nMogxI?= =?iso-8859-1?q?qWQWalerLyH6+zi5PLuXxjqZ5nC6p4VMh4EuK+q+P088TONPBlqgkD0vKhCM?= =?iso-8859-1?q?rtO+C/t45dTVtXLuHVwLTnLwGwQ1O8UQFss2vLaJncVpUnPjtiTbJ0wHdWjI?= =?iso-8859-1?q?UoLmEJ0Rs+kgWrgrl5x25a14vRhBxvAMfwtGqvgsezeJMtyj/+9EMlI5s7Ic?= =?iso-8859-1?q?0knGbf/qjPl8a+bBppCdnR8QjI5TJ9+EW1BoYJ1cP9Y8c9JPzhcZV1Ojksbp?= =?iso-8859-1?q?A2DzcRrKjLzH6/R9sPe7e68fWm1A5fjlFVkfhjPvtVYQ2BRpOmqvbK61URT6?= =?iso-8859-1?q?LE2ZKHS08RKz9EIXHtTzT5+p77E8mZvr1LjTa4ZdrZ/U8oWi3o7pCVxo6NDi?= =?iso-8859-1?q?ePmgk7aBXFaiK7pSugecLlC3zvX3VzDvxoXi9pHFiWkomyFEiZ+OxB8pjlG+?= =?iso-8859-1?q?pGZQ6axXwovTkVKFdPHpZQT9C4FDiLJYLnliUPZA/H05yxqyt94WxQmjMTse?= =?iso-8859-1?q?I/URwyzz/oYIY6z0u+T89S6vbw+bbjTrp6jy6N2s1QAFGnjjyiY/5GA+UdX9?= =?iso-8859-1?q?VmnSEe0+DSX4SvYuS0kNP8lPZCih/KNfkYrJonpKsp41fiVBp8rgZG6So8ls?= =?iso-8859-1?q?/akr9tceKRy7+IuzOzub1sz1Ty5GhOZyuuYiHYhSKMgg9CDthcxoYMQBkPCH?= =?iso-8859-1?q?BXRzkpfWtAfUUozil6jwZDiGv88+jnPzXDIcOeeesETEFlSN5dvKaMTjMhPp?= =?iso-8859-1?q?jOmYyHYFwnr3WvhbR/TRhyGllCG8AoACxCHsnnUO6TNovqiVt68BDHMSFJNq?= =?iso-8859-1?q?Lx6X+HpGhvAYatuDvjGoUwwBJ8YoJfHBQkI90R7MaVP90mNTnYVr4SoFpiAQ?= =?iso-8859-1?q?0YX5lty0jqM8MRqnOcGBJCJz2/RaQlyWhpqDW9c6WES+S8HNTgMgX5SeIXFV?= =?iso-8859-1?q?Z9Y/W8YFy7s3iTRJqVTUYiTNEpZZKhUzk+haohuJyJELAzHpDbk+Yq3H5/cO?= =?iso-8859-1?q?IJXjRkLvN/0DQlV/4uWx6+Du0PRyxW5ev3XM83p9sHYdJx3zvY36cQQbb0Of?= =?iso-8859-1?q?kY7IA1aZ8nfRDLGrbdIuQXdYKUuZMLsdWW/aiSW/M/wT0DZdYN4f9FSNvplB?= =?iso-8859-1?q?ITlmBlDpy3lEYZ3AZkbfgmlH+PWNuByOC7HzkLlZ82ObleE8vdHIOb4gM6Dy?= =?iso-8859-1?q?OXu+d3GFjwR7SiWrn?= MIME-Version: 1.0 X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM6PR02MB4022.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11100c28-d2bd-42be-ff2d-08db98382e61 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Aug 2023 17:52:06.6529 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 20d0b167-794d-448a-9d01-aaeccc1124ac X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: DaHcq/8kf8e6ewgD+J4hTZGk6FskwINWZWMGcP8n8vi40dz4LRD1/cjXr5CWJzDqkspohBF4WwmFZTyiHo5Zzw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR02MB9743 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] Fix failure to initialize ddagrab if adapter ID is specified 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: AOdzlgYbnm7Y Fix failure to initialize ddagrab if adapter ID is specified. If an adapter ID is specified when initializing hw device for d3d11va, ddagrab does not work on Windows 11. This prevents capturing screens connected to a secondary adapter. Failing command: ffmpeg -init_hw_device d3d11va:0 -filter_complex ddagrab=0,hwdownload,format=bgra -c:v h264_mf output.mkv The reason is that d3d11va_device_create uses CreateDXGIFactory to create a DXGIFactory 1.0. This causes init_dxgi_dda's call to IDXGIOutput5_DuplicateOutput1 to fail because it is only supported on DXGI 1.1 and higher. The fix is to always crate DXGI factory using CreateDXGIFactory1 as proposed in this patch. Fixes: #10385 --- libavutil/hwcontext_d3d11va.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.40.1.windows.1 Jøger Hansegård PhD Senior R&D Manager The Qt Company Sandakerveien 116 0484 Oslo Norway joger.hansegard@qt.io +4792642127 www.qt.io [cid:image001.png@01D9CA31.9D2C6180] [cid:image002.png@01D9CA31.9D2C6180] [cid:image003.png@01D9CA31.9D2C6180] [cid:image004.png@01D9CA31.9D2C6180] [cid:image005.png@01D9CA31.9D2C6180] diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index aa50538d64..fa8d5410f2 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -62,7 +62,7 @@ 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"); #else // In UWP (which lacks LoadLibrary), CreateDXGIFactory isn't available, // only CreateDXGIFactory1