From patchwork Thu Jun 1 14:18:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO4Z2VyIEhhbnNlZ8OlcmQ=?= X-Patchwork-Id: 41936 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp497442pzb; Thu, 1 Jun 2023 07:18:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4WoTv0LIpbnfBodXtxtO9NDpHcSSxufvdKmd1GoTaGdMJhT2eTYUe6y3gu+hHbRIIFOS02 X-Received: by 2002:ac2:5202:0:b0:4d5:8306:4e9a with SMTP id a2-20020ac25202000000b004d583064e9amr27264lfl.46.1685629110768; Thu, 01 Jun 2023 07:18:30 -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 n10-20020aa7db4a000000b00514a5fe82easi1705848edt.410.2023.06.01.07.18.30; Thu, 01 Jun 2023 07:18:30 -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=SESTvL9z; 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 841A968C255; Thu, 1 Jun 2023 17:18:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2101.outbound.protection.outlook.com [40.107.8.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D10E68BF73 for ; Thu, 1 Jun 2023 17:18:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KPDgzfdPl9QtGaID7l2d8fWEo3wfczOim/U7w0jhxqluaonn4B4I/or1U5H0EFvwr2zzbjWT8lfjS3naSDY0N8addqb8kBTx8XkKPCLPloueqKicHfCjpOmaGlKHg0aAf8qa1E0dZw8ivADKOI8/U13lReWD/vX1Y41eNNAZupkfwyPbDbNFgzqgU/e4Hd+OJDU8lNyNK1FrUFrxEVKFQkFaZz8QDU8pVisncwhNephNv6eVpx38MTzxZuROffdJWxYUvEHbAtNrqddV0i4Wb63Fct4+V3tCwAT+vD8ogih8Qbyx5lRdx8zY7PZNSakjhhKU+0mgZykqmT+leDLMng== 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=0oIAPFzToCTjLsR+l+gXHR4oVPEKSmWC/K/ToFLW5SQ=; b=ZwTGBmilZfIzAOHyCI701JYGEPk2V5KxxOETyjzweLglOSm/g7Ff8hjIPDq06GwNu183rZ2pVVYy5RSkgQsaGHinTwTV5fdiMwJdmU1oxmJjqkBEFjMlg19a23RUW14rF9P4aFi63wRsYFlAvX6ZU5Qf8tdr6EgXw87ZP4Usmb0PAOhhzuMbjp0go+N9Li+unnaIItNJ4CjkavSrhZ90w0EjWCzqiBvcnn6Cq0fXJzK+EGY17JVgJDNOWCjIuO44eQ4bPU4xjYIKUoqxR3ML/ldtTtaxeYfQ1aXtoqjTZstAmY/p+1FDoG0U9z4J1jaHuh+7/MCzWY15ctKM/1V+Gw== 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=0oIAPFzToCTjLsR+l+gXHR4oVPEKSmWC/K/ToFLW5SQ=; b=SESTvL9zSxQVfQvZusUjY3w5/8JhN0pE6mQxCc9NtElEdxDd4nKdNL3wiBqr/3mbeJLURhEZn+8AgugBSQw5JDFJbeZgHom/nN4E77A7JVsTjq4kp6Su+ziWfXlTOfPy1ZGybgskitTBFvAJXOJiqtVvwWNXG+CO4fNQng+GTBg= Received: from AM6PR02MB4022.eurprd02.prod.outlook.com (2603:10a6:20b:42::19) by PR3PR02MB6217.eurprd02.prod.outlook.com (2603:10a6:102:71::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.23; Thu, 1 Jun 2023 14:18:18 +0000 Received: from AM6PR02MB4022.eurprd02.prod.outlook.com ([fe80::d220:97f0:c560:fc02]) by AM6PR02MB4022.eurprd02.prod.outlook.com ([fe80::d220:97f0:c560:fc02%4]) with mapi id 15.20.6433.022; Thu, 1 Jun 2023 14:18:17 +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: AQHZlJPgLwmNtqf+TEuZS9B5oqynVg== Date: Thu, 1 Jun 2023 14:18:17 +0000 Message-ID: Accept-Language: en-US, en-GB Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: 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_|PR3PR02MB6217:EE_ x-ms-office365-filtering-correlation-id: 76c030b7-facb-4c22-9926-08db62ab0bbd x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: vlr7Y7YJz5nbOZFxgeKURIgYrP70kMi86PFf8ibPpoI3Dd/xs7KdqRexrHv6IfBbtS7e0YGQz6Ucz3xyLgOgFHg4AseRiHihg8YCCuVFjiGBV+wmC7oix2G7IlLeNZxk/K6+5js/HqFSEkzir+iGSZVWjVQmcghTzKatoHF1GaHgHA2zNTh98OO1P/buDeZW7ZrjipM0HoWUz64BTBD4oLIW4P2yc9JEGlLX3nXCu94k25fXsy7/VsqZRky3UCvDP9CmrJIXRQAg04bXdKDIOgLMDRDmLKVkcjTrpH62uxx6pMKpa37g1KRFB0dJK74daLpyb+eKeI0VEX99k+kdk8iChBEWEQoZZeVi0sCiGogehistgPKGp6JGspIOq7zkcDW8QG7BJhiRQXwdYvWWZ/LRJ4QjrLUm0DQvY7c7qJBQSubMj/kv0+Y35bseElHatlNE6qm4FkwByPEYH9t+GBJSZLWEF1OwIY8biBtyThm7lVpoxvxP/fyOj6LISHBPMD86DmztAAVRs8w3gElYfoQtpHBNOJSYieoYWKiKHNFfmVr42M3uBIwHwpH7oHPwL4TyOqs5EAH839DFWijTUHYsMI0Nqno6eV4R6k4f0yJgP3d8ZyEkGoYYGbWbcXZZ 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)(376002)(346002)(136003)(396003)(366004)(39850400004)(451199021)(8936002)(83380400001)(186003)(2906002)(6916009)(64756008)(66476007)(66446008)(71200400001)(316002)(76116006)(66946007)(7696005)(478600001)(91956017)(5660300002)(6506007)(53546011)(26005)(9686003)(52536014)(8676002)(41300700001)(66556008)(55016003)(38100700002)(122000001)(38070700005)(33656002)(86362001)(19627405001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?IEKTv6N713j6gPC3XS9MDBc?= =?iso-8859-1?q?rxJ1OQ5qSIpOJCCYb2+310ljhsP+lmdqjYZo79o7CJOnsNirOldHG2wucYF9?= =?iso-8859-1?q?4jawBrN+/MJnf+IkkXOrdW3n+j+59b/jzImJu1Z9ckxKaCeLeuByJ33ZrTca?= =?iso-8859-1?q?MRbLrwAo1cAJ2pagRmKvWP7THHHCNKfz1j81UbIuEBI6Bmz2izTVQwQfbaAZ?= =?iso-8859-1?q?MZfEVVpb4b75s5/OOeQH/N1uk3r7B2ig0PressiYuXJKDKNQ/ZjliCdxjvwv?= =?iso-8859-1?q?FZAQTRnqeiIAen1MhDhkbWxK9QSETZW37d0yyWkxf13jQBZFWv6DmiUOL6rP?= =?iso-8859-1?q?f2ZhAtHTdDNBu1RwaDctAvxst5XhYdhhE0pT/SyDTpxN2QDSJ+7jYNWw2O0e?= =?iso-8859-1?q?323BaU8NZNxU1ox584s5oySBBCNOsHFcwVRVvxthUUIkLvGMHJWpJFaNemcD?= =?iso-8859-1?q?GhfvSuXBPHu+LkgR54oBZxCl7BF8ITaXLs1J+pTJi6waNlCN3BYBrG8u+R3x?= =?iso-8859-1?q?ZsqnrPblunGPa0jz7q/c51DmmjHT23fTWi0VkOykNlPqdK7+u6m2eu3lC/JO?= =?iso-8859-1?q?pLNL6L2aTji0BGBbfm3DkVW6izDfheW6Ndwh6MmezUaiZexB92x8iKPPP9ds?= =?iso-8859-1?q?Wl2mtJ/8lt3MViK983rnVVW8mB2Z4gQamW+ovmEFbCuH77xY99dCkdLjtMlN?= =?iso-8859-1?q?Ui6pqIUnM2tBE/+cXB5PgkJ2FvvL6bHUepw7fzJ1PaJol5CALXCSJmg3FWKf?= =?iso-8859-1?q?4V7ltK7ze3vJwWABSk6yG+bf6xuCTpwmBIXqXxC6EB9Pi8YWpcS9xy5OSLBa?= =?iso-8859-1?q?CrDySIhHf8NXnSjj5SwrskGZaB9d1niV8gD/mYGTm/RTN4AZzTlkYeyQwKmY?= =?iso-8859-1?q?/UUoYEEtdu+VaCBwDhF+Qywai0+QxFszn8Awgi4eR9aEC+MsdsqF552hJzk5?= =?iso-8859-1?q?6V+eek8A3i812/38wH1sz60x2hfLKwbOdYCPT84YvWquun6N2k5lU6WK5E6v?= =?iso-8859-1?q?ZLJRUFj3crFoe0qgqmxd8j6q8OI7dFVMFIum5g1aCm8XhA/kewIneXVmfrWS?= =?iso-8859-1?q?JI6DIrBGHxkB3pANWDvFoWtWVm4tUOi9+IXExm5cxSO5m4gvTVCYMYx9o9A1?= =?iso-8859-1?q?ijpacfgRh6O+06QJTxLixCkpdFfGUBLTqwqumWnVrVVkx/quvV5NrtgDjaXS?= =?iso-8859-1?q?3lJKKo04ks0We5o3zt44W077xo+qpEcMEeqZxTfI4IvEvgKTEWSPuqlNR1Rt?= =?iso-8859-1?q?STpBoLfgHLnW5Njh85kggeQ52TI/yhXdYi074CvyQeNsq+EZ+swOhluAyDsF?= =?iso-8859-1?q?FKfdgvepE25xydXXQlPBWf93HnJwXANh8YBkaArmekNdRKaQMDvWMaRB5/X5?= =?iso-8859-1?q?qh3GQdPpvglUs6S5y3aPEWQmv7g8n/HvN38mk8L64NCSFOiWUJeKjgmXplVD?= =?iso-8859-1?q?nGcVCneJS9nfrlxKpq9XkDEmMTYHiOehM1DHhcp7jl6G7/kirFt5UHLq12f+?= =?iso-8859-1?q?SHuoDlL3KzCjeG1XJ2Wjx8uMDmcRH7qulpwq2zfOWZlK8Jj4nY5oV1uCaNYZ?= =?iso-8859-1?q?DNkZDJ1zYXns+6NQ3vTcePemt0E8q5b+tEUUwnD7ML5z4VgnXE1KH+tOQMMD?= =?iso-8859-1?q?ARpjaZ+tZ30fSbcB2?= 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: 76c030b7-facb-4c22-9926-08db62ab0bbd X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Jun 2023 14:18:17.8757 (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: s/yd4d/gOV8qFgcIP/iTB3K1Ysg+o33RwF6j2l04xeY2w/XL+HHAAmrXbo4oDumLziuzaDwGZC1GftCqdTNd1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR02MB6217 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: jatwVn0JR1iS From dd7208b1edd0d7efcde1a12fd468a180737ad9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8ger=20Hanseg=C3=A5rd?= Date: Thu, 1 Jun 2023 15:30:48 +0200 Subject: [PATCH] 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 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