From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C0F5A49422 for ; Mon, 12 Feb 2024 00:00:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D502968D125; Mon, 12 Feb 2024 02:00:39 +0200 (EET) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2036.outbound.protection.outlook.com [40.92.59.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 971F268BCDC for ; Mon, 12 Feb 2024 02:00:32 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AMewnH8cs6VLIgEs5C7W3bBT+aiRvU9gZc2sZZvsaJyt91JCTxbDqDfGBjtihvUQ2TgbePSeW9a5DJiKohPJMtv9b8mgwyRxyPMhYqVC5WESzRx/b8842QQZGxlnQHHVnG0TWtNsiu0mNP3eU7Vc50aeMX0cT4bydlrY2TVw8/ctTq9Fqged5ALl8LbaKvK8eITTsRp0APVGfOMawE28tgms7WF+M8HU7X7875oPZAfZp0Ncw55IL85EIhsRh0iPwWQUNOrQ/+OS86utYvwCL3xbFis/Dc5L0IoFyLbEz3sw/pESm8Y9mk8D19GoTikkDeiIUO2MYuJkhpWXLijL9g== 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=hddSvO3dNCHfH+TEtjRG/0K0BM3RJ6DScfgs5ZyG7VA=; b=kS6ZX9fueXjSqnVqKQausyal/t+n60BG5vGmU+x39GM9j4DXaXQJmq+dEaa15G/U3coC38rZtyihXiTEyJqwPZCXTIVZtrOHlbwCdvJax9seKfEyQogNymS2GIS4B6ME8tYWvijVV3lQumoRfmw1J3rVjdMrp69AH9g61GoEsj9efqvJyw12TpUpKYAaIbA99zVT+dscBBUnleX9MtqEm1zSPHKYdEDBp0q+Ep7oZdb47hE7IpSqrO6Yl+lCrZNyj1yU76QaRjlW8KH+hRmI4mDbJtODpwM7tWe+ajfpc9h/Voc0GzkLE4A3Lman1gvlwnLAlZCHbc6IDUod4TFsHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hddSvO3dNCHfH+TEtjRG/0K0BM3RJ6DScfgs5ZyG7VA=; b=IS2s63jZR1TSXuhsCw0djA6MG9l6cxaONoIVhuOsKy3Px9ThKrZ1BMVDRP16GxlTwXRPCb1mH//P3qcbvTbZX8ibsqz/Oie70fU5IHU6Ucv731qSok+ezhGOAZ8uHI0He9HcAEMTYzL2IlLwccpoQ1sz8GRxhBBo/u23B4x0lT9p3rCLfGmTn4tlkjFgejqqvLl35Ke5OACEdKZpKZcO8V0NHil7UD7O3Ja9AFlh6wyBw0Z7H78A6qpWnadlbrcDLYxCU6RpuA5WvRb4YNqi0N25XpHinzyqn6/1F817InfTJOkdrUvbb18i7hQr8MHs5s3Xwrj/2pqD2dRvl6Q3CA== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PR3P250MB0257.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.35; Mon, 12 Feb 2024 00:00:30 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7270.036; Mon, 12 Feb 2024 00:00:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:01:58 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [2YH+wuPoMAxStF/DPkWcfVkVTD3rZYm2pvmJEwdUceA=] X-ClientProxiedBy: FR0P281CA0181.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::8) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240212000220.3975928-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PR3P250MB0257:EE_ X-MS-Office365-Filtering-Correlation-Id: c549edbe-419c-4015-7f31-08dc2b5da07c X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdl5Zlrnc8YAZkxqMYEXwih1EpybtniBlX4/vb5b2TrpeTWp8yp8Yd/2t7Mw9j8ENRd/jeLwYANnitnVZNHD8QDIHEhP4aGA/sUGuyaGMgVF9HlHZTq6xrsaBn6HCStAZR6vgO21ehcbgX+o4W/3bv2Oltef3LjxzHf1co9bab8C3wg0SoOtAuO+3mCZfE4B2jPLWTYz5eT6oiFqNSA8shcKFqtdX3uGLQX29BkPgvRrWZxavVHCZnRzxMXQALgIgmrG38Dixzbo6euXmlOf4zQEIQivqIjqT40dUmKvRb2ekyfl1eP27jUzyibImIUifix5sp2seQG7rNXJJ7x3Yzjy7h+givMR+RKkJkMlpmV9FU/XSCmCuXE36nzhVoNNSkcXliE2wyG0BwhvezLctehMnmCxaZrJWvjB6BFUXJLcqMWBglrDTQX7rBOWBSm5x0/25Y10Io8tEBUi4G2Ft8rA4/NkiFtP+afW6SJoP8hZbkpdb4zfyLkM5sa//+JI0LZ11zLU/IS/2N70gG4RUtC+GNq9zmvYqnPo68GNmdzTICwleT7uOVsDKEutGAeYgh9hW0DjGK4MDA2b949kmxbHTsjiYEaSLUJZ17MiZLdQgxlGBcTqywWp8/DTacw+5DCtPJ4VtaRamBFkxnW36XXaMm39xr4K17EZWhiHZykzTxC3G7kWANii0scK/bIGGJSshId9srvEtrcAThr8zaRPhmhfZLK2y9Sm0CKu/iqHTtkn5TthOle0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TwR7las0fxTQKbzduUkfHgHZqcCGAS8NxkaonpPFoqjHwrztEThcEl1YMTzYW+GEJ/G/FTULbIimd3KtKOhoE1WALgXa9TTOPWs/meHkbkvhDAp19BTOZ0Ab/hcJ1M/ACftIH6w/7PsCQyPWiMxV3+n6tZWy3Gnnki/R0uODRNOQ1nl0pd1FGLnWJQF+GePhxmPDSDpSMz+uP3aPspHnKfvJrqJtXNrJMC21ZV/Zc2BfXndSugeX0e6NCeu1NpdckV0nG7YHuUtoGoGTWU5kPufj69ejICt2xopQUpKr33uMI6O03c8ef1PotdNle8zIul/bwumqEeii1+z5lf82OKhRkESijEvzetQOxLUq2lDreWJKREcciBf6w/4zKjjnBM4F9MlOtC3mnBYKL6QKz3uJmcI6bcrtgph+3cTBHXV+ojf9kYxXfOp+wS3g6hIx1T0bfSsitg6ASJG96fMaFjqXFiiVc1N9SlyQkEhTkfv6am2tjE3YjUf1hYEm8/u4pA8OLc3ojqlANDHZ96/fSMu7Vjj4XtMR8n0guEe1rtWG+HPt2d8iUydt/WpqtIF0NdXzmsp1RBVt4E7v3cJ/o8U9KGfC/SeqYl1QD97xK/A1Q03xTiQgd/wXnwEQzzbH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zP4Q9g2aRlma5s1LFSduA9PG1OurQs20Uh27oGIMCW7dT7Iq7xZVFo8LHrZk?= =?us-ascii?Q?JSNQuhyrsc9gmpKxOD+8sgE72yFKdDBrpcEW72TZTmo++89ZS6WdHCBIuvvo?= =?us-ascii?Q?qk3cC8ulBB9SlPrOyMg0K+Vlrhh75p5q3P2zZ8cKskONaMXfyYWqZ+Jz85gs?= =?us-ascii?Q?FIhrjNhXYPicsxvSgt6qANU/dIYpg1z6RDR7UNa5eroJbQeEY88NW9o+TG3e?= =?us-ascii?Q?jsQTerpgyUEGOW7KVQ99eS5eU5OCU9j0Eep9qeVh3sETWXFeNK8D1gjsPyc4?= =?us-ascii?Q?/zIugsgNOWpMPFEu3WdwnvFCBNKeKFl8PZwwTMdaBH/xbtNg2R0NQ+IhCJmh?= =?us-ascii?Q?2vGBJGGvcwQoQ3kiiztj0GO6ZtLMWWK61Fbv9ACUpxvlplL5gmvcO5rwQ41u?= =?us-ascii?Q?j9ECg97rhyjBE6+ZAK5jzB4lg4P96kkxfGkzIyEO6npVLK1br8IcSzZp6fJ+?= =?us-ascii?Q?foDj8kRl5WQtj0KQVsmCM8JSJ/gzDCPzDTxruHCQKrTtQPUkNR93NHhi+FAN?= =?us-ascii?Q?weFyE7wPtktvsPP30cx0RHHJZnaJJw5kHqAKzS/Z2Xrt7OE/kQqVq1t4b9RY?= =?us-ascii?Q?bGRztJ+SYGyu6GIn9O7i7ccIcqZUWPa+EI9lV/O90F1lj1wJ/+BkCTubKql8?= =?us-ascii?Q?hFfC27WnNBIfFoAqduf0nEaq791R75GJY/Ajh+qLXQObJI1nWWQrCyYweST5?= =?us-ascii?Q?87cAhUn2qakq1XJiSy2zjzZzGQ8UmeJu1fNUnWu5tWnNBpbby7W/Am5BR4RU?= =?us-ascii?Q?/CdwmK08cWhUvPnNHRXmRCUPKRG0lTSzmw0oaThOUa2AdOwr3NrrTEzzaQ0T?= =?us-ascii?Q?FzB1ESWNYIjuhid4PeKouM8NyR2EKi8f5h3/SP3C2skI3+6Ue45XEvYDVHBp?= =?us-ascii?Q?pmUpmzmbyNpDTbGbzGDAir6FzQ6WScECeiHbzcVAnN4fsQ12CkaGBCfciMyh?= =?us-ascii?Q?awGkNc+4yjdHIgPIIRf8OdGad0rEtoi9CSjigDQT6HrNg36beD+ZHE70xyCa?= =?us-ascii?Q?2IwAE4/lEQ0uhwTmbO4SYDfRgssGdPPS4AfsJMF/Af9NlZybkaTVsF5Rt8tW?= =?us-ascii?Q?mDq9sgRd2SaqOlYBHoNN5z6DH7nIcrlNCxnQQbwdbrwpcBFM2SX+d2eH7kOW?= =?us-ascii?Q?KmO5uFZ3a9Gus8Dz6ezrjrKsw7neTzS+RHaqrWPK937RxGk4JeCwgPFKKzIa?= =?us-ascii?Q?d9ucjsoMbOQJ4eiHBejzOniY6QPrbvV21NluTFobjYLhYoC79xsXlGe9CaDU?= =?us-ascii?Q?AXgHmaiaJbAFCh9TRzKYQDoyyW40TQt/+lTtuVy4EQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c549edbe-419c-4015-7f31-08dc2b5da07c X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2024 00:00:30.6937 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0257 Subject: [FFmpeg-devel] [PATCH 01/23] avutil/hwcontext_opencl: Use proper OpenCLFramesContext 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: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The currently used pointer when unmapping DXVA2 and D3D11 actually points to an OpenCLDeviceContext. Signed-off-by: Andreas Rheinhardt --- 1. I'd appreciate testing of this. 2. Most of the patches in this patchset can be applied immediately; only those two patches that remove AVHWDeviceInternal and AVHWFramesInternal need to be applied at the bump. libavutil/hwcontext_opencl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 247834aaf6..c1764ed098 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -2346,7 +2346,7 @@ static void opencl_unmap_from_dxva2(AVHWFramesContext *dst_fc, { AVOpenCLFrameDescriptor *desc = hwmap->priv; OpenCLDeviceContext *device_priv = dst_fc->device_ctx->internal->priv; - OpenCLFramesContext *frames_priv = dst_fc->device_ctx->internal->priv; + OpenCLFramesContext *frames_priv = dst_fc->internal->priv; cl_event event; cl_int cle; @@ -2511,7 +2511,7 @@ static void opencl_unmap_from_d3d11(AVHWFramesContext *dst_fc, { AVOpenCLFrameDescriptor *desc = hwmap->priv; OpenCLDeviceContext *device_priv = dst_fc->device_ctx->internal->priv; - OpenCLFramesContext *frames_priv = dst_fc->device_ctx->internal->priv; + OpenCLFramesContext *frames_priv = dst_fc->internal->priv; cl_event event; cl_int cle; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".