From patchwork Wed Mar 6 23:35:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46859 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d90e:b0:19e:cdac:8cce with SMTP id jd14csp709933pzb; Wed, 6 Mar 2024 15:36:20 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXQVtjkgLfVGNRaCrrBzo0OBkW2heWFPrrEJoodzmWOGbcPTY6OsEeunNGinPkA+qjlxCByqCQPOFQYgHmzEyNJKFiwhOWZb8itXQ== X-Google-Smtp-Source: AGHT+IHosuRnSEfOKAX6tifvKqwQu6t4C+O+LLFkqwaNQ6o/KKH4RbfHeBZGJHg9PmdVelCfXUGF X-Received: by 2002:a17:906:99c7:b0:a3f:1e63:8ac with SMTP id s7-20020a17090699c700b00a3f1e6308acmr326960ejn.3.1709768180285; Wed, 06 Mar 2024 15:36:20 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q24-20020a170906361800b00a45b8c1a74asi1024007ejb.967.2024.03.06.15.36.18; Wed, 06 Mar 2024 15:36:19 -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=@outlook.com header.s=selector1 header.b=VB6C6Hxv; 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=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0204768CCF8; Thu, 7 Mar 2024 01:36:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2049.outbound.protection.outlook.com [40.92.66.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEFDD68C4B8 for ; Thu, 7 Mar 2024 01:36:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XW55ERrCg/Tbie/vXYaiqT/KpHC2WneF07+o44r9vF5uEFr74Q5KAj3AvUKvhfOWKUYJw1dSdFSyIe8eXg76nJu0FIcmAt7Rwnyf095upCS8QH5I1ioDsLhqN9waCyDr3IzSLnZaswt3jRLpT2d8uAQzu+u59VjXNKiyvY6P0Kacd+xNJAyCw2yIUCl1Jnp2nZMfvTZJXpOoPq/3pbXkANmUN6YYzu820kOjK7al/o/O78KpwPjHZpbBto7/8GikSraKOUhy/dLdZoyPf7anMtxCdvn4f/5zl03N/vV74Nvg3stKgW3XQPZpSspyYNkiR+I+3u7wenZ4ZSiprQ2qFQ== 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=RZ/NXHIuxyd6P/2n5wPLBLdDXJke47HhdDmrI0k+RP0=; b=G+4yaNAwr3gRWZyLcOvt/GdSApKw75OQOKuOGPuD6L1tbK58Zy0rQa7bFgd+1NBcNF4oBLiYGTcDSP/1RsFp1fotdcy8UjYR4Jcbmq8zNqTd45sH7vvtL49waYYuBAd0AuJaop2Mguevf4Qkzam6x5vbjiHPbAi/kWRfP2Fb+sSKvVf9CrSF8cjYCLoC1s8kE2eM4MRWDQ7Tc6yoYyxYfrS0z3BB1W08h+J1x4ICiP62k5dQUJZNvNnGjspHPUfmYFZTVJjcudHK4ls2I+JbWW7IPL22yyY+hEsyO1Af9Tx6ENezZ0xvFib8zuQVDyMuAxGPdU80DCDcZX1Pf9lgWg== 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=RZ/NXHIuxyd6P/2n5wPLBLdDXJke47HhdDmrI0k+RP0=; b=VB6C6HxvlQGwUUCW/lLY9XSZEPtMYDB4qSs84dCtN4H1RWr05MNDVCcaIJa2RgvGsWwCrdkqyBea7V4ZmG21JAbBMYho7czN2Hs4NX2P65NQKsuAK3rzvJYVwyx2td/G1r1fav8DDGQT/q68hBbjWQfMrKzmYjco34aEWeSzCVMeTLddsRCw4DqSNvpxTfBLlZiTdCu8V7qfC8FhDVc1tbAKZ5SnLB3nMWakCUzYkcbBWr9DlXudN3KYjQdXIfzybT9wZgvOVRIQ91LR1g5woBYiFNl7JyykQ9/hG5EurgwNFrbZUG4GwzWJRs5XUpR1FR6tOY2bipXe90zu9Hb8rA== Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) by PR3P250MB0274.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24; Wed, 6 Mar 2024 23:36:07 +0000 Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b]) by GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b%5]) with mapi id 15.20.7339.035; Wed, 6 Mar 2024 23:36:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Mar 2024 00:35:59 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [FHWEmt+6gRQXZvC9Yvs8ZdFM7DgTyp+dVgI4FfgCCVg=] X-ClientProxiedBy: ZR2P278CA0044.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::6) To GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) X-Microsoft-Original-Message-ID: <20240306233559.3391718-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0052:EE_|PR3P250MB0274:EE_ X-MS-Office365-Filtering-Correlation-Id: 4fd8f866-c387-4727-16c5-08dc3e3631cf X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C7mM4AshAJxbikq3feEbVXEcrWXkFlscNScG4flSdTLlGoC+f3njx6KHLVCLnzAbIcLs7KuEg8NeWyFKbnTCYf2hriZ2MUaO0/vb0ga6y2zLU8kLtSbkLvWSF6lFedNysl47wH9fm2YDkQdX+7X6xJC/hhsyJhLalF/EVvYPOV66YkfBuOg+8Vz/gANaDnt/OhjbR8a/uiXfnbqxQsx7Nka6zfg+YjloNWL9/cBgx485ma63kftIEQTvZUNwpoKDJhrUOuSB6XC/NbgyWhMlNuYmgiBySglW9C/ftzaxrgdFq2rmGq9XrjQW0C7fKy/REtks/PuI2r3xG95gVYRRJyp/Ult94Ods+oy0mllNAm3/QYaikf/43xctuzF4BSZMV9w3RvmdLkbK74UGc/Qczn+AaM2R6A2gKJSw6iXYS8TilkGLZD8cTcuUMWhpKOuc8/ZASbtHHHbEAafh0k35XpMV6f/DyYoPbDpfoZfRE600SjuNdvQIWgmoiqKpy1XiCVQPagyAHLzJaq1H68m0YuXiWqDPcwxDJDIJ9eMLw8z646gyT0Dc4bXwgB8IemfmGuCY2y5kIExrlxGkC6tJn/DHIJCAZgIDVzQeixPBAORXghv8tWnYYNBVGLAhNt9/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XX1VLwrq8pbGDY4tRtQAnSKD7S5Xol0ctmJiP11+HUXN04GGqsTe9S/A+SFTZKtHbpUN3mPheSbjTDxNJJ0NiV7OmSWFPlsRbsPP+zGJJRPUiQnuV886DuSfp3zUQJgMiOM2A7jJeCkClf6b9QsrCukas8IaRE7lNq6loh8fiJWmSHjTTqrXdMQV+eRX1kWmqdl/orzhThYsOwelXr+HYfCf8i/VHnS5gj+n+8C117dwumELIDlQch7Gw/EDFrHoxoo4P6buT0yEGWe8N+TsgwE8E6R7VNZ6IvSxdaddBAxaXeFVj79nNnCOJe8u0BMamFoMrCdArSn9gT0Yi/2qxPFXhY4O9BjkYN13eJVznRYEqJ/KdpUiCrC6E4ovw0GvMQj8fyqdIWK2Re+oR/tOAhkdyATr0bANUgeO+x7NIKT8lwmi31pR4dvccLEE0N9CsKMm3QN6V/WPpSLyBErALtRHysyJAwWlatqgnCZzquvNjvBQTePk+GKtKbzaqPPgPlqDn46CCbw3vxrRDo9UzF1NPYAAfbtlhX9pHSDNQoSWw7K8wrxQPDwl1yrDDFC/uINS2lZBhqrzAx0OiXnJoA7WzLMPGxvMdzqq7M/ISK940xDuHv3htITXOu8/eSiVXUmpxfy/j/XjTZHtQ+H6Vd5hv1Uddoi74emgjP1ZUfBiIcTFtp7+6kxpAusEUkpqVM19/vYUgWhZ7wWYFS0GiVNdp3/risAd49en73sMeRmq7ERDSaiAKRrMsYn1tpLQ0sQqOpx2QzTsGKG4GF7bupdY1/C/GpGDewy88WTTXYf/Z2sEOy9GHWNQzH4dseJKA4aSj/lVrWfFAzbOt56CeHRgqCdfoewBF5DtYaewwrp4AsJQAZ2AJd+iQt8nNs47pm3KxZ0zRWhND+KLzsdVHzNmUf1ByjCPtAcyQpbdCxhPtMnG9cQGvRk3dkn+rcFh/i3pYjwC1XTHB32riPjW2kyrfzOV1EO2c7DYq74bgDOuXAWLtum8moh4FaA9oZkRftkn3g0VJXD0H6K27QLOuY1dLuJaOZCadpWUTLhZJVkRY9r5Ag6sr4zlVsaUxP7BNzpCFT3zUCVCdPEowzh3GxYa4/F6Zpav8ZZZNapdZBUwdKlQuxrb4ssegLRbIXZuBT2irLUGR2vjV92rPbXDeRYbknlb47yBzR7TBZX4bPjrE60f1SBMILyjTzfvIMViaY7Lxxz+/zvfo/MZ1slTSB6cdKPFlbVP86bOQzNdYkFbwJgfYnf0neUGdGKQ+WGIm7bkkHSEOT1ykqEo4Xz4Gw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4fd8f866-c387-4727-16c5-08dc3e3631cf X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2024 23:36:06.6289 (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: PR3P250MB0274 Subject: [FFmpeg-devel] [PATCH] avcodec/vulkan_video: Remove unused array 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: n1M9fJIIK714 Signed-off-by: Andreas Rheinhardt --- libavcodec/vulkan_video.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c index a87df52871..dc6652709f 100644 --- a/libavcodec/vulkan_video.c +++ b/libavcodec/vulkan_video.c @@ -309,7 +309,6 @@ av_cold int ff_vk_video_common_init(void *log, FFVulkanContext *s, int err; VkResult ret; FFVulkanFunctions *vk = &s->vkfn; - VkMemoryRequirements2 *mem_req = NULL; VkVideoSessionMemoryRequirementsKHR *mem = NULL; VkBindVideoSessionMemoryInfoKHR *bind_mem = NULL; @@ -340,11 +339,6 @@ av_cold int ff_vk_video_common_init(void *log, FFVulkanContext *s, err = AVERROR(ENOMEM); goto fail; } - mem_req = av_mallocz(sizeof(*mem_req)*common->nb_mem); - if (!mem_req) { - err = AVERROR(ENOMEM); - goto fail; - } bind_mem = av_mallocz(sizeof(*bind_mem)*common->nb_mem); if (!bind_mem) { err = AVERROR(ENOMEM); @@ -353,12 +347,8 @@ av_cold int ff_vk_video_common_init(void *log, FFVulkanContext *s, /* Set the needed fields to get the memory requirements */ for (int i = 0; i < common->nb_mem; i++) { - mem_req[i] = (VkMemoryRequirements2) { - .sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2, - }; mem[i] = (VkVideoSessionMemoryRequirementsKHR) { .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_MEMORY_REQUIREMENTS_KHR, - .memoryRequirements = mem_req[i].memoryRequirements, }; } @@ -400,14 +390,12 @@ av_cold int ff_vk_video_common_init(void *log, FFVulkanContext *s, } av_freep(&mem); - av_freep(&mem_req); av_freep(&bind_mem); return 0; fail: av_freep(&mem); - av_freep(&mem_req); av_freep(&bind_mem); ff_vk_video_common_uninit(s, common); From patchwork Thu Mar 7 00:32:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46862 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d90e:b0:19e:cdac:8cce with SMTP id jd14csp732873pzb; Wed, 6 Mar 2024 16:32:57 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW/Yu3Y2qbRcDEeNn8EWVCIt+9hPNqGhMHqsFO5HT54bJkuVssWIxSBeWA32XuJF3bunHm0GRVYt/16zlNaa7ULUS19+yKcrD0yQQ== X-Google-Smtp-Source: AGHT+IHYWDP+KZtm4PsAMjF5Mmoqz3kd6JbN6FVPQS8MCR2IzqX/cNKMK4Hegr8bnf7MpOWou0F4 X-Received: by 2002:a17:906:f355:b0:a3f:da1c:ae4c with SMTP id hg21-20020a170906f35500b00a3fda1cae4cmr12809271ejb.54.1709771576790; Wed, 06 Mar 2024 16:32:56 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q19-20020a170906b29300b00a45c4ca579dsi483511ejz.257.2024.03.06.16.32.56; Wed, 06 Mar 2024 16:32:56 -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=@outlook.com header.s=selector1 header.b=amXl6WiX; 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=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A293568CD4B; Thu, 7 Mar 2024 02:32:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2037.outbound.protection.outlook.com [40.92.66.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 350EE68CCCD for ; Thu, 7 Mar 2024 02:32:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kX3GP2bVsmb8MQiNEAHbXr4Q4U6fKh1PX3g1wOQ3hp4yC7T7P6Kn403Kn07uSvvRJqEEVP5UcOod/tQTWFKbGqPqT0jId6FTAYK9xxQ7P4sdVOs1cSJykON8x0LG0lqlYcs7/cF0nQW3SX0tTuORoOSp49gUSjwNVCHwJl26hQTOhk+xWjlmBqepazScvUbwLlVQkvn5undKRv7s7YtxVqI8PNWEsrbUB1tKxmjqt/152kO2fUXPgzMWFUNFIQyahroFB/JxQq9qcQB2nkCcSB+uxj3UqpT+mB5lsy8cNvYYHQmJtgYiWLpSguoXvt6fTDEAiZ6WqSO6X397ew3Gog== 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=EGzebzTxt3qGtz33ycOzB8q/DjxF18Tk8lHOFgRW7cs=; b=gSJOzsJRESn2OQLDOdDhn1FN78cifEznp22Yem8dyY8FoFqqhPgFIQ0mBZOlTyHMdTP6CBdQTNxKS7vu+Ze++YF+h9Y+v+eRUi1OYpKKbYOi5fr83PSBreu2tT+KXAMAXuOhbD5MIRylD2cSOA30PStrWtrGWUcD+KCXJOdsLLaWYiozzUBT4GodmPBoma7hgJfD2Q2jqPRdbvefmqNNoSzJe2shhyVGiU/Rk33JIa7hliRVRHr6pjp7GluAl1ecVS4OgM8HLHk5Q8XDozLuii37loLyyDpMYFeIpNOUfE5Mo4OXMaxotYDVwAR30WNn70gZGDs41IlSRKcM4peNJQ== 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=EGzebzTxt3qGtz33ycOzB8q/DjxF18Tk8lHOFgRW7cs=; b=amXl6WiXTXnWXs5S97LgtgzypqsJo6q2Y505TbutZto+deKEmDay0Mz6gViE5b38d4hES77rShyeiqplAxiJmjRrCuQtTrkBGc751BQEGpBf20lTIhWkoGEEn4w2nImVH6SGJMU5JgMP/V5Gx5DJThSU9vSmdG1Ayq9TDZZtCQXs3HMXBAoMEkFs/NtB+xriKc9GtIqSOGRwN0TtwXf4CtxepUyUR4WDzkAaTxqWVK44tqvpM9e/NzFTqIPrsfHb+6jgs39lfVUnOFnMxArR6Bkp3GVEGUnAWlg6G9aoJdx7ytwb4BJ+wC0/WUud187BLWVPQgorYzG4xT0FGZXHzg== Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) by AS8P250MB0038.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:359::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24; Thu, 7 Mar 2024 00:32:42 +0000 Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b]) by GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b%5]) with mapi id 15.20.7339.035; Thu, 7 Mar 2024 00:32:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Mar 2024 01:32:32 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [CauufUXoTePaUgixuKdhEv9sVAk6+a3yYAN3v1NoxUY=] X-ClientProxiedBy: FR4P281CA0243.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f5::11) To GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) X-Microsoft-Original-Message-ID: <20240307003234.3396724-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0052:EE_|AS8P250MB0038:EE_ X-MS-Office365-Filtering-Correlation-Id: ed2eaf86-e52d-4881-20e9-08dc3e3e197a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qf55Dz/tVit+VS48gyqrRfCHcg3nxPprtVhI0kTYEuekHJlD1P4J7twTqXUQ6t4zYqRFPXzkKnrdhXjsGTTXdT1mo/xD7wAdNX9WNYzf/QQWC2abWWZbYj8nLVxujaJ6L03J+uThNKOFhli9nELc8zk1iYr/JZxHvep9RjGjMLw4A1biHDYqFuPM6GWnC1yHiJZysqbJy1Ob+mWMfk8drp+x3onVONWcvZT3MMODK11a5Ws83pQxUGOPhS82ukZu4IWdvymLGqKfOWrwvl+6J/y07JbCXwsdFCWs4BWRX/7rNMgKZS7g42DlLjQ4cFi2pMt1p+sZPJYQsj3LyVpP1NY/VVzLDmtnF3cNiE3CsbGeIemohQm6PAOaVIWgUrV5fPAz9xN6SQXU4kRzK0HKm02YDBce9qseO3a44PyY2BqUVGvIwPbTsWTWfdL1qXljCWJSjATI+dW5E6Ua9bWM94lje7xVitG2x1GTvo7zUUoU76zb8WHwKeoxg7UhXpm5dW+9bavzw+ACfiJU4WUSxOEDhe7dMCvXS3QcACRU7Mn016q8BJIYRKP2mC9B5Vpjep/vd1G5gxrVetj1p9AGQ9qttE6sexgDzA0meg61FdgcfYc4mGBEkhc47T1eC9NF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Fa3plfVQsR2febPeaJd6Kjl5c5P2WqJEuJf6GmIA8YR0baTkr9YCBKQXta1pSn2RhGUh67JG34a8bw/t72ZZCbDuPjzVTtTADTo2YTB012mZOLJAQnpKkb3dr4c/LYQKWwX8dBik44KSzdEjxO2FUshE7YtkTln1j0jUReq8fGR9jJSy7PH2WjkKURdubpwa+8DJiAdImQswBWRSK4h44mDUWk2q73bMpkQGoVP3WhihT/c5Of+1fMbpM1Q8QmwMF/y+Ojx1XhD7bQxrIUrcKMVTdozRc4w/7nRR/O/EpvPYj7QG1gBYD0UvJeqOd1TdCHS2UgD9GQi7Lg/V/1OM/AIr15/s86JGSrAFg+4IB9uGi4tctxhI4HQDnP0pRvqCoVosDr2VmRNg5ebj0YQwrJugZfYWIOX56qdRlxlrKppdxG8+qbN2cnyFcY08ky08w89mdD5/z+EFOH0zGcEQk1eeWieh/wc/MmWo+eqr4ZBNs03BQdrlOQBus/gYgLXQXA0uGF4OXNssKwFj3aTDmyoU7GOqFhk5fF+rk43GTA4BTtFy6xdrvshS4RRBV1ed2JC8uoI53rpLIyL19LkYaVl70Aul9venzbcfQX3kx227zgQvs42iYGWWsUs6SDbhCLK3+0ATKvOXh56+0ik5C8gHGWxwZRAf44Tpm067YTTxd3LrDoXk7dkAza1RwyxcUXY+meO/yNPqAtXCDZX/UeT3RC5+AnsYZ9MkoEgiL9Z7vjV3jJ8W4FWGp2r5ETjdwMYkPl2jjOysqyWXUBPp7tC1Zv05b5dkVf6C5LzcZqe7nb4HNObQ5NELK1CnOqwAspHZj/QJF925matOMxToasuY6Kd2Ph3Miwu/x46S08C1SNKuQOPXmCx7qapYDlHOEB/TxZK/Hl5pszOxnpYFziHM3MptqJZql06LW9JrEZiANyFQdRLpMWLgJg5KDgb1S7jqccYthUUAs21YDrgIsU2G6/u7IKOw1tmdivMCtbXs8GFARiLcmEuYyff46oU3fv9gWvvOamiabZ4YduG5SXvVPN4kqPqQROba4vb5JlWmiGWIlwP0fpyrsD9an9+4BQmIIx6kaVVYeyEnWI71SiRJvYp+BE9wQ9AH1S7Ndh3SW7cPG8QvR0BWLjkA3n5Jswe+aeX9jm+igzMVeTnT+SuLLXOW69W+9RwQUmh4JIz7SYL5oeyvlIwdn+oMCi0UhvC4xKf0VeUsIXTgAmkevJAJJjn2kWeyVH48cidfqwNf4DkBv1NqJO2lDeT9lv9T4oN4xYpSlCBgYrqW473ZMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed2eaf86-e52d-4881-20e9-08dc3e3e197a X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 00:32:41.7853 (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: AS8P250MB0038 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/vulkan_video: Merge dec part of FFVkCodecMap and extension props 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EqdPnWTdZ3Wt All the fields of FFVkCodecMap are either decoder-only or encoder-only (with the latter being unused and unset for now). Yet there is already a per-decoder struct containing static information about these decoders, namely VkExtensionProperties. This commit merges the decoder-parts of FFVkCodecMap with the VkExtensionProperties into a common structure. Given that FFVkCodecMap is now unused, it is removed. Signed-off-by: Andreas Rheinhardt --- Given that these descriptors are decoding-specific, one could drop the decode_ prefix from decode_(op|extension). libavcodec/vulkan_av1.c | 10 +++++--- libavcodec/vulkan_decode.c | 49 +++++++++++++++++--------------------- libavcodec/vulkan_decode.h | 7 ++++++ libavcodec/vulkan_h264.c | 10 +++++--- libavcodec/vulkan_hevc.c | 10 +++++--- libavcodec/vulkan_video.c | 26 -------------------- libavcodec/vulkan_video.h | 11 --------- 7 files changed, 50 insertions(+), 73 deletions(-) diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c index 9730e4b08d..03ae553ff8 100644 --- a/libavcodec/vulkan_av1.c +++ b/libavcodec/vulkan_av1.c @@ -23,9 +23,13 @@ /* Maximum number of tiles specified by any defined level */ #define MAX_TILES 256 -const VkExtensionProperties ff_vk_dec_av1_ext = { - .extensionName = VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_EXTENSION_NAME, - .specVersion = VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION, +const FFVulkanDecodeDescriptor ff_vk_dec_av1_desc = { + .decode_extension = FF_VK_EXT_VIDEO_DECODE_AV1, + .decode_op = 0x01000000, /* TODO fix this */ + .ext_props = { + .extensionName = VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_EXTENSION_NAME, + .specVersion = VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION, + }, }; typedef struct AV1VulkanDecodePicture { diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index 2448ee99ec..6777aa5887 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -20,38 +20,33 @@ #include "vulkan_video.h" #include "vulkan_decode.h" #include "config_components.h" -#include "libavutil/avassert.h" #include "libavutil/vulkan_loader.h" #if CONFIG_H264_VULKAN_HWACCEL -extern const VkExtensionProperties ff_vk_dec_h264_ext; +extern const FFVulkanDecodeDescriptor ff_vk_dec_h264_desc; #endif #if CONFIG_HEVC_VULKAN_HWACCEL -extern const VkExtensionProperties ff_vk_dec_hevc_ext; +extern const FFVulkanDecodeDescriptor ff_vk_dec_hevc_desc; #endif #if CONFIG_AV1_VULKAN_HWACCEL -extern const VkExtensionProperties ff_vk_dec_av1_ext; +extern const FFVulkanDecodeDescriptor ff_vk_dec_av1_desc; #endif -static const VkExtensionProperties *dec_ext[] = { +static const FFVulkanDecodeDescriptor *dec_descs[] = { #if CONFIG_H264_VULKAN_HWACCEL - [AV_CODEC_ID_H264] = &ff_vk_dec_h264_ext, + [AV_CODEC_ID_H264] = &ff_vk_dec_h264_desc, #endif #if CONFIG_HEVC_VULKAN_HWACCEL - [AV_CODEC_ID_HEVC] = &ff_vk_dec_hevc_ext, + [AV_CODEC_ID_HEVC] = &ff_vk_dec_hevc_desc, #endif #if CONFIG_AV1_VULKAN_HWACCEL - [AV_CODEC_ID_AV1] = &ff_vk_dec_av1_ext, + [AV_CODEC_ID_AV1] = &ff_vk_dec_av1_desc, #endif }; -static const FFVkCodecMap *get_codecmap(enum AVCodecID codec_id) +static const FFVulkanDecodeDescriptor *get_codecdesc(enum AVCodecID codec_id) { - for (size_t i = 0; i < FF_ARRAY_ELEMS(ff_vk_codec_map); i++) - if (ff_vk_codec_map[i].codec_id == codec_id) - return &ff_vk_codec_map[i]; - av_assert1(!"unreachable"); - return NULL; + return dec_descs[codec_id]; } static const VkVideoProfileInfoKHR *get_video_profile(FFVulkanDecodeShared *ctx, enum AVCodecID codec_id) @@ -671,7 +666,7 @@ static VkResult vulkan_setup_profile(AVCodecContext *avctx, FFVulkanDecodeProfileData *prof, AVVulkanDeviceContext *hwctx, FFVulkanFunctions *vk, - const struct FFVkCodecMap *vk_codec, + const FFVulkanDecodeDescriptor *vk_desc, VkVideoDecodeH264CapabilitiesKHR *h264_caps, VkVideoDecodeH265CapabilitiesKHR *h265_caps, VkVideoDecodeAV1CapabilitiesMESA *av1_caps, @@ -722,7 +717,7 @@ static VkResult vulkan_setup_profile(AVCodecContext *avctx, profile->sType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR; profile->pNext = usage; - profile->videoCodecOperation = vk_codec->decode_op; + profile->videoCodecOperation = vk_desc->decode_op; profile->chromaSubsampling = ff_vk_subsampling_from_av_desc(desc); profile->lumaBitDepth = ff_vk_depth_from_av_depth(desc->comp[0].depth); profile->chromaBitDepth = profile->lumaBitDepth; @@ -748,7 +743,7 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ { VkResult ret; int max_level, base_profile, cur_profile; - const FFVkCodecMap *vk_codec = get_codecmap(avctx->codec_id); + const FFVulkanDecodeDescriptor *vk_desc = get_codecdesc(avctx->codec_id); AVHWFramesContext *frames = (AVHWFramesContext *)frames_ref->data; AVHWDeviceContext *device = (AVHWDeviceContext *)frames->device_ref->data; AVVulkanDeviceContext *hwctx = device->hwctx; @@ -780,11 +775,11 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ VkVideoFormatPropertiesKHR *ret_info; uint32_t nb_out_fmts = 0; - if (!vk_codec->decode_op || !vk_codec->decode_extension) { + if (!vk_desc->decode_op || !vk_desc->decode_extension) { av_log(avctx, AV_LOG_ERROR, "Unsupported codec for Vulkan decoding: %s!\n", avcodec_get_name(avctx->codec_id)); return AVERROR(ENOSYS); - } else if (!(vk_codec->decode_extension & ctx->s.extensions)) { + } else if (!(vk_desc->decode_extension & ctx->s.extensions)) { av_log(avctx, AV_LOG_ERROR, "Device does not support decoding %s!\n", avcodec_get_name(avctx->codec_id)); return AVERROR(ENOSYS); @@ -796,7 +791,7 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ avctx->codec_id == AV_CODEC_ID_AV1 ? STD_VIDEO_AV1_MESA_PROFILE_MAIN : 0; - ret = vulkan_setup_profile(avctx, prof, hwctx, vk, vk_codec, + ret = vulkan_setup_profile(avctx, prof, hwctx, vk, vk_desc, &h264_caps, &h265_caps, &av1_caps, @@ -812,7 +807,7 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ avcodec_profile_name(avctx->codec_id, cur_profile), avcodec_profile_name(avctx->codec_id, base_profile)); cur_profile = base_profile; - ret = vulkan_setup_profile(avctx, prof, hwctx, vk, vk_codec, + ret = vulkan_setup_profile(avctx, prof, hwctx, vk, vk_desc, &h264_caps, &h265_caps, &av1_caps, @@ -867,10 +862,10 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ caps->maxActiveReferencePictures); av_log(avctx, AV_LOG_VERBOSE, " Codec header name: '%s' (driver), '%s' (compiled)\n", caps->stdHeaderVersion.extensionName, - dec_ext[avctx->codec_id]->extensionName); + vk_desc->ext_props.extensionName); av_log(avctx, AV_LOG_VERBOSE, " Codec header version: %i.%i.%i (driver), %i.%i.%i (compiled)\n", CODEC_VER(caps->stdHeaderVersion.specVersion), - CODEC_VER(dec_ext[avctx->codec_id]->specVersion)); + CODEC_VER(vk_desc->ext_props.specVersion)); av_log(avctx, AV_LOG_VERBOSE, " Decode modes:%s%s%s\n", dec_caps->flags ? "" : " invalid", @@ -1122,7 +1117,7 @@ int ff_vk_decode_init(AVCodecContext *avctx) FFVulkanContext *s; FFVulkanFunctions *vk; const VkVideoProfileInfoKHR *profile; - const FFVkCodecMap *vk_codec; + const FFVulkanDecodeDescriptor *vk_desc; VkVideoDecodeH264SessionParametersCreateInfoKHR h264_params = { .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR, @@ -1179,9 +1174,9 @@ int ff_vk_decode_init(AVCodecContext *avctx) /* Create queue context */ qf = ff_vk_qf_init(s, &ctx->qf, VK_QUEUE_VIDEO_DECODE_BIT_KHR); - vk_codec = get_codecmap(avctx->codec_id); + vk_desc = get_codecdesc(avctx->codec_id); /* Check for support */ - if (!(s->video_props[qf].videoCodecOperations & vk_codec->decode_op)) { + if (!(s->video_props[qf].videoCodecOperations & vk_desc->decode_op)) { av_log(avctx, AV_LOG_ERROR, "Decoding %s not supported on the given " "queue family %i!\n", avcodec_get_name(avctx->codec_id), qf); return AVERROR(EINVAL); @@ -1198,7 +1193,7 @@ int ff_vk_decode_init(AVCodecContext *avctx) session_create.maxActiveReferencePictures = ctx->caps.maxActiveReferencePictures; session_create.pictureFormat = s->hwfc->format[0]; session_create.referencePictureFormat = session_create.pictureFormat; - session_create.pStdHeaderVersion = dec_ext[avctx->codec_id]; + session_create.pStdHeaderVersion = &vk_desc->ext_props; session_create.pVideoProfile = profile; /* Create decode exec context for this specific main thread. diff --git a/libavcodec/vulkan_decode.h b/libavcodec/vulkan_decode.h index b0b1ff5614..3e7cd38774 100644 --- a/libavcodec/vulkan_decode.h +++ b/libavcodec/vulkan_decode.h @@ -25,6 +25,13 @@ #include "vulkan_video.h" +typedef struct FFVulkanDecodeDescriptor { + FFVulkanExtensions decode_extension; + VkVideoCodecOperationFlagBitsKHR decode_op; + + VkExtensionProperties ext_props; +} FFVulkanDecodeDescriptor; + typedef struct FFVulkanDecodeProfileData { VkVideoDecodeH264ProfileInfoKHR h264_profile; VkVideoDecodeH265ProfileInfoKHR h265_profile; diff --git a/libavcodec/vulkan_h264.c b/libavcodec/vulkan_h264.c index 39c123ddca..695b986a7c 100644 --- a/libavcodec/vulkan_h264.c +++ b/libavcodec/vulkan_h264.c @@ -21,9 +21,13 @@ #include "vulkan_decode.h" -const VkExtensionProperties ff_vk_dec_h264_ext = { - .extensionName = VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_EXTENSION_NAME, - .specVersion = VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_SPEC_VERSION, +const FFVulkanDecodeDescriptor ff_vk_dec_h264_desc = { + .decode_extension = FF_VK_EXT_VIDEO_DECODE_H264, + .decode_op = VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR, + .ext_props = { + .extensionName = VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_EXTENSION_NAME, + .specVersion = VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_SPEC_VERSION, + }, }; typedef struct H264VulkanDecodePicture { diff --git a/libavcodec/vulkan_hevc.c b/libavcodec/vulkan_hevc.c index 033172cbd6..e3a1319958 100644 --- a/libavcodec/vulkan_hevc.c +++ b/libavcodec/vulkan_hevc.c @@ -22,9 +22,13 @@ #include "vulkan_decode.h" -const VkExtensionProperties ff_vk_dec_hevc_ext = { - .extensionName = VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_EXTENSION_NAME, - .specVersion = VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_SPEC_VERSION, +const FFVulkanDecodeDescriptor ff_vk_dec_hevc_desc = { + .decode_extension = FF_VK_EXT_VIDEO_DECODE_H265, + .decode_op = VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR, + .ext_props = { + .extensionName = VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_EXTENSION_NAME, + .specVersion = VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_SPEC_VERSION, + }, }; typedef struct HEVCHeaderSPS { diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c index dc6652709f..4be13ecc55 100644 --- a/libavcodec/vulkan_video.c +++ b/libavcodec/vulkan_video.c @@ -16,34 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "codec_id.h" - #include "vulkan_video.h" -const FFVkCodecMap ff_vk_codec_map[3] = { - { - .codec_id = AV_CODEC_ID_H264, - 0, - 0, - FF_VK_EXT_VIDEO_DECODE_H264, - VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR, - }, - { - .codec_id = AV_CODEC_ID_HEVC, - 0, - 0, - FF_VK_EXT_VIDEO_DECODE_H265, - VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR - }, - { - .codec_id = AV_CODEC_ID_AV1, - 0, - 0, - FF_VK_EXT_VIDEO_DECODE_AV1, - 0x01000000 /* TODO fix this */ - }, -}; - #define ASPECT_2PLANE (VK_IMAGE_ASPECT_PLANE_0_BIT | VK_IMAGE_ASPECT_PLANE_1_BIT) #define ASPECT_3PLANE (VK_IMAGE_ASPECT_PLANE_0_BIT | VK_IMAGE_ASPECT_PLANE_1_BIT | VK_IMAGE_ASPECT_PLANE_2_BIT) diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h index b06e369abd..bb69e920bb 100644 --- a/libavcodec/vulkan_video.h +++ b/libavcodec/vulkan_video.h @@ -19,7 +19,6 @@ #ifndef AVCODEC_VULKAN_VIDEO_H #define AVCODEC_VULKAN_VIDEO_H -#include "codec_id.h" #include "vulkan.h" #include @@ -31,14 +30,6 @@ #define CODEC_VER_PAT(ver) (ver & ((1 << 12) - 1)) #define CODEC_VER(ver) CODEC_VER_MAJ(ver), CODEC_VER_MIN(ver), CODEC_VER_PAT(ver) -typedef struct FFVkCodecMap { - enum AVCodecID codec_id; - FFVulkanExtensions encode_extension; - VkVideoCodecOperationFlagBitsKHR encode_op; - FFVulkanExtensions decode_extension; - VkVideoCodecOperationFlagBitsKHR decode_op; -} FFVkCodecMap; - typedef struct FFVkVideoSession { VkVideoSessionKHR session; VkDeviceMemory *mem; @@ -47,8 +38,6 @@ typedef struct FFVkVideoSession { AVBufferPool *buf_pool; } FFVkVideoCommon; -extern const FFVkCodecMap ff_vk_codec_map[3]; - /** * Get pixfmt from a Vulkan format. */ From patchwork Thu Mar 7 00:32:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46863 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d90e:b0:19e:cdac:8cce with SMTP id jd14csp732939pzb; Wed, 6 Mar 2024 16:33:07 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUCF18IRUN6xT4kPE7uQWeO99wjEg2n/RbJgmLlHBUH5Ru/cVMSuTm6rNyNbDobMM9WKP/dAM4KufSkQhnUwwGHKUwAMoa6G5TBYA== X-Google-Smtp-Source: AGHT+IEWAvuui6rXgZ5Iv5ROFqwmvN+x+YfjnjQ0uvcXB4rL2O+CvdGMaslOMXh6WwkBNi98YCkE X-Received: by 2002:a17:906:f18e:b0:a45:cedb:5564 with SMTP id gs14-20020a170906f18e00b00a45cedb5564mr115939ejb.37.1709771587116; Wed, 06 Mar 2024 16:33:07 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qw30-20020a1709066a1e00b00a3e3776fd57si6255159ejc.28.2024.03.06.16.33.06; Wed, 06 Mar 2024 16:33:07 -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=@outlook.com header.s=selector1 header.b=nJge2QsY; 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=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B2BE368CD8D; Thu, 7 Mar 2024 02:32:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2037.outbound.protection.outlook.com [40.92.66.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B136168CD66 for ; Thu, 7 Mar 2024 02:32:50 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BB2fOAoWVrI3RBzJWK+Uk2F0Opr+JltzEAmE4N/wyvlx0Kr/Tf1m8YVRJXtUuLo7f4TgPN31PCrU6QqnoKC3vMK6FBcAsHlIOyy2I3v8oivj3y8Vc+5JxDe/3oV4XY0tIDZEWH5l14PhWWtRX42HgHcpZ4jsCEIbRdZR4X6TH18AbXKqUcfDutWyesFqtoL8+cPcLnrB39V6bm3WEMAJ4XJOElhpMzP6W3qEFm4Ow5Pu2HuJdGUW3cpgqKPTZDdBo0eaOkfi3pZb7KqMB6yDjvGXruR9iQ/2Pforh85Bzz2Eox6hOIJ/O98+ZNWJAUZL7XuoHFhoLvHLIxIFaMhsJw== 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=i/o6A7mloHErHp/dpFGeKfXPK6zMEaPRP8y+oxq3hX0=; b=TQZTMv4W8rEjG63xMHRloNSOIjU75b/upKs95r+u7zZmwNKnLNKqoyKmVWtYiQ7tUucd923RuNGtuHsysdFYuJup8HLFePcspm51QTGbXuH43ouWi+q3wI7rviOBct8HkLQC1MUab6O8HsKgcOnoeDZyUUuNsWH+fIiWvljf8wJ420wWvK+W8Suta/pMsC2tNCTB+d2HQk9UOl//43MW2FAk/vBuKK8XrDwKiTbePAy9JoZpHW/HzOek1ILxt5Z3i2elMHOonCYHQwugVlMSKFmAnaWZeGMKiHq528awMgeBhSw/5X++4A1sWqCIJOKFx/RJo0YerdBq0qX43bC5jQ== 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=i/o6A7mloHErHp/dpFGeKfXPK6zMEaPRP8y+oxq3hX0=; b=nJge2QsYrOtiyAj1lrCgRz8+3iZ+v8FAzHBj3OLN2qV77/zWPbBbVLISzz9PZ8sgHekuRbOThOlX2uDIpdZCVIY1JoWOaiWR+9vs/Hk6Ix1yjDPqpjCb85d3tzrrNKkEGyjV0owOibFYG1DMZx6C7RNd6Hrl7uC+G7tkBO5ARMW0NEtPfiT4TZAmeLmGJo2mcGGIIy1KxrYUPvDJzqylxSOIyMq9ZqBi04s89eXS0tKfKeeywqpd1GRclLnROzEPQYAM3HI0v2Yc0BOhn+bSWKbEpYPJtU25n7ldQn5SPgzpwKPwoW0YBdqDDXNdh/WWCGGqqGu+xlYKyAOGXTwocg== Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) by AS8P250MB0038.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:359::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24; Thu, 7 Mar 2024 00:32:44 +0000 Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b]) by GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b%5]) with mapi id 15.20.7339.035; Thu, 7 Mar 2024 00:32:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Mar 2024 01:32:33 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [iSXJndYZp8t59TawCXULzVOOcFk/S7Dr58sos6We9FM=] X-ClientProxiedBy: FR4P281CA0243.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f5::11) To GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) X-Microsoft-Original-Message-ID: <20240307003234.3396724-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0052:EE_|AS8P250MB0038:EE_ X-MS-Office365-Filtering-Correlation-Id: 41f742e8-5186-4adf-c8ce-08dc3e3e1b3b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MNUZCTCO8K91mh3q+Vrqr0eBr56k2O2Yv1EvS5MHshpXPpqC5qbYiKiYlgORJG53YZCvIfEk53xeHF/YVaHARp9mVKV9pzyaxCgOybHqfmzkUV6kCdlj20ZWbtwQRxGYsprpcQypL8CqlNG44pOrO+PyLaAjd8mCC5oq1+qtSk301kMECXAf8HrRuzHp1BQ/dkY7XVkAFywFSt46FZ0aaVLIG5f4DbRT+qglbawkjHQa0bFBKeo/bHm94pymLBf5NnKPD7gXx1Sj550pf7221j9L448wUso1V144wZ/BKHtjW8mQG6M+WIJHCqu7ofRYEr0fS+g6UiLhu4HbpamwvfJP+LIk89nGvhv61aC88Ya0fAA95H71ywV348d9lzDJc0PGZPOzSsUJ6mym/0bVC5CPINNG5Zdts7IJ3Dday2a03xbrjf8Z5YYlTslk6TYoE74g8OtNnp+qR2RBq3yWSesDnPDBrPxBXXQwgsvm96cwWvlz+Ea8IH+Frrr/npDaBsqar9Xz/ocK57CUDN1SYu8Y8sbJ+igjROpdWn+7Lzz4Wu889BB31wAHgwxhVEZOGHZrT9rg1HkZnYhXl6DjutA9pSTTsrYcyiFuvD2xJuNE63kFKobkysQTnN8BGITk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rocDDDLMphBOW2sAZsRX6E2+y0rx71r++1iBQiiPsskuRuaUnyrw7Lw6NC3ns3rw8y6KiWZ9PDgM+Vcr3p5Ri66YemjmsGMx46fuP+YfO7R/HFkeMtU7SP1pVEEF+Tu7+X04ykON/QPf2uzzCEe0tcsKVNCEducagB9PW7zXNPkKO5oltMdOsIlhHFU/Lrt95fZmdAXgoZ2drOjnC28YS46+UsWkNryFbpwUrh9ZOvqzbu2+iT83Vc6GAC/t37jEPIZl/BWswSInX8LdUVtDpsWxoLn8mi5XzRb9mRdUxOgv821VFSqG04eYUID5aD/PfxC26TBslbZmxHTb9+pUp2GUMOzJ2BUP7m98cwHz1H7+szPxNhw6baL/7l1j/7AhHAexzKooukyjWWWJeX3iQk8ZDieT9Q1vTJhMzM/8IIkG8nu0E1l0L0VfjQ05xpFdB51C6jU/gBtS+YGUjL2erAt1J8VCbRx2jW6lzs2zZE2c0ws+FoJKT/y2FpynCbxMA8rO139J/cTnm+qv7C186SII0LY3BeAM0uux3C0ZOmjVGGcYKeBrZmQkE9c0Bw1nEeQ+SCaxP77NqsXcdtJLCBKNaxB099CaCOdil2Gey+460ehMtzUHDY6BLBA0LjiC+hB8O+okh2YpaD7vmTNiW7WkmBKPp5fp0epyUprYueLYcL3ej8125vNcvDvgnP5BeY3ze6nfCWOLZ6TyWL9tC9kewsWmQwB1vU8/2IhZYek7mW4SXPTu0x53GlY9s9y0d1bElfUbYDmpQoWtn4B8ybZSuTTwjq8Imfe/Fy5KJ+NWdStzMQACdZ1trfe/PHEqQw5Rjg5LEDpEIyjBJ/S6+kPglE9V5XsuZCptCZr7GHEFBRdHvtGjugEBGkrdEaovjXYBpEt2/GqkgUkBpE95AFHEqwK3uQ9odWUeLwPgeaah57FjtA2BjoiBe4VHSJxGsZXu4Damutua9rg/Jatb/EnP/lTZxQ5Xw13z9fTVOU6LcJDIUNE0/JnTjvFu2P9B0O8m1svnCiJuwryAsDTZkndLj89ACQXh4hnXYTYtytkojnsbxCXVz8jeioic7dtP+nY/L5O0etvUjkC9bsl12k4dehIqETA7CncUleH92y1ZFiXtTNKiIyd4ay0IliZS5j63WEcfzCJ0Lk6eVisyL6J3gdlrnrYrwFMqV4gbSxndr1JsVOpQf1Rx1NCR8/Zav1YR8UqR5FstPIDphVCgHtg7Hx8n1cFG/vVjlDuIIm1+Yrhy5TFkgRN2nR2iey0jpocOD/FAnNY0LfZd5yTkFw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41f742e8-5186-4adf-c8ce-08dc3e3e1b3b X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 00:32:44.6986 (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: AS8P250MB0038 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/vulkan_decode: Un-sparse extensions table 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BMcgrdjeXcjX Only three of the 226 (== AV_CODEC_ID_AV1) entries have been used. Unsparsing this table is especially important given that this array lives in .data.rel.ro. Signed-off-by: Andreas Rheinhardt --- libavcodec/vulkan_av1.c | 1 + libavcodec/vulkan_decode.c | 13 +++++++++---- libavcodec/vulkan_decode.h | 2 ++ libavcodec/vulkan_h264.c | 1 + libavcodec/vulkan_hevc.c | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c index 03ae553ff8..5afd5353cc 100644 --- a/libavcodec/vulkan_av1.c +++ b/libavcodec/vulkan_av1.c @@ -24,6 +24,7 @@ #define MAX_TILES 256 const FFVulkanDecodeDescriptor ff_vk_dec_av1_desc = { + .codec_id = AV_CODEC_ID_AV1, .decode_extension = FF_VK_EXT_VIDEO_DECODE_AV1, .decode_op = 0x01000000, /* TODO fix this */ .ext_props = { diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index 6777aa5887..233b5792d8 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -20,6 +20,7 @@ #include "vulkan_video.h" #include "vulkan_decode.h" #include "config_components.h" +#include "libavutil/avassert.h" #include "libavutil/vulkan_loader.h" #if CONFIG_H264_VULKAN_HWACCEL @@ -34,19 +35,23 @@ extern const FFVulkanDecodeDescriptor ff_vk_dec_av1_desc; static const FFVulkanDecodeDescriptor *dec_descs[] = { #if CONFIG_H264_VULKAN_HWACCEL - [AV_CODEC_ID_H264] = &ff_vk_dec_h264_desc, + &ff_vk_dec_h264_desc, #endif #if CONFIG_HEVC_VULKAN_HWACCEL - [AV_CODEC_ID_HEVC] = &ff_vk_dec_hevc_desc, + &ff_vk_dec_hevc_desc, #endif #if CONFIG_AV1_VULKAN_HWACCEL - [AV_CODEC_ID_AV1] = &ff_vk_dec_av1_desc, + &ff_vk_dec_av1_desc, #endif }; static const FFVulkanDecodeDescriptor *get_codecdesc(enum AVCodecID codec_id) { - return dec_descs[codec_id]; + for (size_t i = 0; i < FF_ARRAY_ELEMS(dec_descs); i++) + if (dec_descs[i]->codec_id == codec_id) + return dec_descs[i]; + av_assert1(!"no codec descriptor"); + return NULL; } static const VkVideoProfileInfoKHR *get_video_profile(FFVulkanDecodeShared *ctx, enum AVCodecID codec_id) diff --git a/libavcodec/vulkan_decode.h b/libavcodec/vulkan_decode.h index 3e7cd38774..a43e328d73 100644 --- a/libavcodec/vulkan_decode.h +++ b/libavcodec/vulkan_decode.h @@ -19,6 +19,7 @@ #ifndef AVCODEC_VULKAN_DECODE_H #define AVCODEC_VULKAN_DECODE_H +#include "codec_id.h" #include "decode.h" #include "hwaccel_internal.h" #include "internal.h" @@ -26,6 +27,7 @@ #include "vulkan_video.h" typedef struct FFVulkanDecodeDescriptor { + enum AVCodecID codec_id; FFVulkanExtensions decode_extension; VkVideoCodecOperationFlagBitsKHR decode_op; diff --git a/libavcodec/vulkan_h264.c b/libavcodec/vulkan_h264.c index 695b986a7c..0b296b3cc3 100644 --- a/libavcodec/vulkan_h264.c +++ b/libavcodec/vulkan_h264.c @@ -22,6 +22,7 @@ #include "vulkan_decode.h" const FFVulkanDecodeDescriptor ff_vk_dec_h264_desc = { + .codec_id = AV_CODEC_ID_H264, .decode_extension = FF_VK_EXT_VIDEO_DECODE_H264, .decode_op = VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR, .ext_props = { diff --git a/libavcodec/vulkan_hevc.c b/libavcodec/vulkan_hevc.c index e3a1319958..e2acc35612 100644 --- a/libavcodec/vulkan_hevc.c +++ b/libavcodec/vulkan_hevc.c @@ -23,6 +23,7 @@ #include "vulkan_decode.h" const FFVulkanDecodeDescriptor ff_vk_dec_hevc_desc = { + .codec_id = AV_CODEC_ID_HEVC, .decode_extension = FF_VK_EXT_VIDEO_DECODE_H265, .decode_op = VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR, .ext_props = { From patchwork Thu Mar 7 00:32:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46864 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d90e:b0:19e:cdac:8cce with SMTP id jd14csp733001pzb; Wed, 6 Mar 2024 16:33:14 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUnT0VrdQbZToN1bnt/pxFF9rlEUHcG/ZpC/95dVL+inQN6DFh7CO1IcKtNDggt+cmREqFJz1P61YSbCQ0HOXZ/MeBOk9drCV8cAA== X-Google-Smtp-Source: AGHT+IGjafM3KTzOTlK0RcHTNyBMtht0uEgxeddZd5r0lMQDhrG2h8GPoqq6o7x1QCuc4JnRbLLk X-Received: by 2002:a17:906:6d5a:b0:a45:48b6:1b00 with SMTP id a26-20020a1709066d5a00b00a4548b61b00mr7217484ejt.15.1709771594734; Wed, 06 Mar 2024 16:33:14 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qk27-20020a170906d9db00b00a3f14a99dacsi6437582ejb.322.2024.03.06.16.33.14; Wed, 06 Mar 2024 16:33:14 -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=@outlook.com header.s=selector1 header.b=dVESgJFa; 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=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C66D368CDD3; Thu, 7 Mar 2024 02:33:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2037.outbound.protection.outlook.com [40.92.66.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37E4468CD6D for ; Thu, 7 Mar 2024 02:32:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wv0xOUyAEwXvldhOvEaVbGQ8scjP9sE6C6y849M4Nv/Bj0VdgL/mKO0mUeu7A3WeDAVZ2ogoLn5Nuut0suxDSr7fCYQy7tDwJuC6gQAXSt6wHjPPdW3W9k/5Q/X58/OnC8ZoPxEz6ebQCoqCSTq/XZ6AB6Fyr47IMxnpRqTacVHIig1FTGc1P+zuvcD3wyrByTFpzHTbrujeWsxJuF5QnhjSld6uOkOhXjjpSVlfn0gieE3qCAOQChAzEMGdyJ02I5LtmMo4vVFtmCdPuorvEzXQB+aYPkxKJ0yPOn2/uAw/fgmNQE8us52ZxslAnz2AcZTj4/ci7VoydyJWVv3Orw== 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=1DiSVeh3EBWuLAEkXbljHptLs6+ZpziZ4XHLk2cRMZ0=; b=MitD6OiYDglL/1qgc1LkjZR7iLVMmzDvLwanCk1hh1zdtrSvumsEINQfQxAPdAIymTqWPirzhwp7Wr26VFlXV0Jvq2M5/pmNUbEdao5Up0wadp9iBKw15Uhm+Z/KUQu2Nk58tgW4RS6nRT/biUNYian2S1h5QM5yu9p5VwrqLGpS9x04mUjjThaG1V4Yo+P45P6hWmbz6rqY79NrY8znht1CYFCe4MlkYegcPaKVu+Zoyro/YLzzvOHik1HSU1w9f+ErCvpVsnhRWIhXLmrJS9RLxlP76HWVpHvsEiW4X2yn4v8khSOqGJ/kjyxVZi/m9RY+bBN7zRj6qr0eFCr2iQ== 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=1DiSVeh3EBWuLAEkXbljHptLs6+ZpziZ4XHLk2cRMZ0=; b=dVESgJFasx4GM/B1VwCnU4dRSmJSD96rGAkQa5GrGVcS78JinikJPaWIC/u73sAwkIfhi5hFfcB9JXqgpvmVfNwksC8RzZiN7jp322rViCKsD9PVjq13TMxLMWeM2V29LIdbM8PxcVlkYM1wHDr4b6AbpRhn3xiXT7bTFQcgMiDsK4g/hsXysLHSEnZJjWkZ3MExiZyM876zK3/T7ucqSXf0Jenpml21VSI4VshulizsM6g2XR/6KP+D7ak52u0gpTzwjqufXmf7tw7OmicIDm42sbgueg5dirFu/DCVvTfu5QiXqN0p96FEXs6mHF7GOoEc9QW8OMIvUujA5PU3HA== Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) by AS8P250MB0038.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:359::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24; Thu, 7 Mar 2024 00:32:46 +0000 Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b]) by GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b%5]) with mapi id 15.20.7339.035; Thu, 7 Mar 2024 00:32:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Mar 2024 01:32:34 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [qS8fOrHodoaHmz846hlso7VPsfSuXyoxZmnuVkPcjX8=] X-ClientProxiedBy: FR4P281CA0243.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f5::11) To GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) X-Microsoft-Original-Message-ID: <20240307003234.3396724-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0052:EE_|AS8P250MB0038:EE_ X-MS-Office365-Filtering-Correlation-Id: 94ae75c5-cb5a-40b5-9f65-08dc3e3e1bfd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A1d1HgwsYPhXV7iE+w8qzZCRbTZ5lkWKyg2JESblILQu6cVXIzF3FT5o7lNYOV+imnqWPdCIUxeR/0Iu0WTxwymhnw2zfhMRnbv/rHbdZx2cZj7a4pQQDMNDLhF41Cuq6PiyNoWSuGerLwF6EcWpI0d+Qu04U1RmVBrteE7GKLwV81in79tB9UyMWToGlz19aN2DyuO8Fsf9O5/4nEdP9kidW1Qw/qweLJYOghi5h9Kk6T55gxjeC5+H6+yk8wNMDN3eHshe6rvxl4RCDL/mJ8bFc0Hk81jGcArE0aFGQc9AK5eatStOHpPbvk1sm/mbaNcRYrF08kN7TH9Y6X1V8f+2pV/bgfmmAhXLWWzB0iAWb+7R/9YTJ5FE7I9O3a1oP4qve6kMrj9J6QH3Dlqz1E8H975LkSk5Cf1xaR74feWTte0ipqcNfmh7y267pBSGSeuvS66dq6WbIov1luNhHf/wnaW9MMxYn1cQ0W0v0G+U5Yu2QH7HL5iMod1oZMZ0kDWp0/2ZfOk0RqZM89p4K1xg0MYI7pVBbqGnBj2CpXFBXhoUUdXp5v7Iy8xvhT0xj3VWHkOnsQ6tw5F+KUiFKZgh8A4GjXYzQqkqj0spt2b9YNhXfoEnut508SiOasyD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tQtZ41Ud5Zx8v4Y8zySdg7Wcoa4wnQlhhvzcUNKwr5aFjZXcr02hyHGg+itbYAmdKNZZHucfHTFbTYsdnelT3sOPMvQiQwCoLr+gjR0be9jM/HPbXK5GC+Ku3Az4M8ZesAHz8R4sRHkpUMJ/XsYNMn0ltdccWFcK9XUaMWTHrniVgJP7vvmT8o8lAUdMEtR3ZxrO64skV/ulOPWR6cfCRN74cAIXTXRRi9SbRsld8UrI2YbazWE2VB0pkF2S0JOrvtQENmJvVzirWNQ+dmdqh/U4p0kX5C6sHHN0TkgL7h1vJE4c08J92qdXxHQQzHaIHbnXStzvxe0qgWQFm5F5NkjZc/bLaw0dmURp670OSJRD9kJsmSWcGzLKQ4UNOLvIA5hZ7FKHqaPqW7zck/gQe2S2s7AMSM0UCDjaFBTMu+72K0q+Y1nyGEQWUYeCnkJ34xYQXDZnjxLYAZEpKR2gpKjuphm7ovm1qBkRgBTATTsCHUzCkC2GR1wdF7oXu3zIyjB8Bt8Tr6Vq4eoUoCYqiMQ7HnVbklJ/ds1945hAixlOmZp8ZKCAoH+b1oJAzFF6bSj9zjBUbvGQiJqYZgi0t6q/zSEL7FbqMjTWRoEzxs94WqVsdBrRkL9yOV3kyOsJI8/Ndsgbpvfs87Sz5QxGnPnVJdoyPmy20SMsScQ6MEG9TbcOTJ5FQs59hSPrFht+3f57+SL84cITR4ES5IgwrsQ67ntWKSQI7xfSZ7Aj1PTJFEphqpLjv2sD56WVOZYrIRenMOseK2JFsNkoUz3F7zXTQ5u13QZdqpkf+jMawsMP9Ll+S+GY57L9GluUI4LDD8p4Tea2CzeCWbuBVAy5gpjNmLKeyZ2cOAMNRBhjdsR2JmuYL5rg6NbfOqqqFdkIN2aJ7/2VcpCtZkR2aiyHeMM2qsDu99MmM9Upm5mfOSCnLKV2tEEnBHK/Ty2muijBQVtQfEEWtespPR0bI+gGal2SKNxipZYtavaSvhaP4RJbwnWQQlU9g094Ne4LJ+mH29XZkJuyONz0Wlmk7w7oCec7N1KtdQQnAoRl35hNcLOyWDiks5ZDUAZ6jkhwOXcl0MS4MbJXKZbBGR9wp/A9Jn07DO2vKspvccTkPSzkGihEnfLShcoE7ayTqxYI9ym0dXxDjbrj36CCSsM2tfZXqfNbhswt3iSBXJximPmqOWQAIyQG1P2NmWLIV4jo85rMemCd/MvYJFEiSyuTk1FCJjjiTwTGkl4D2M5Xb9CmzxERyOqXbgs0PjYP5nob2wi6LcGMUw/XlpbMrejDLzUkZw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94ae75c5-cb5a-40b5-9f65-08dc3e3e1bfd X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 00:32:46.0161 (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: AS8P250MB0038 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/vulkan_decode: Remove always-false check 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fBq1af28MfYF These fields are set for all Vulkan decoding hwaccels; they would be useless if it were different. Signed-off-by: Andreas Rheinhardt --- libavcodec/vulkan_decode.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index 233b5792d8..91929d165f 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -780,11 +780,7 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ VkVideoFormatPropertiesKHR *ret_info; uint32_t nb_out_fmts = 0; - if (!vk_desc->decode_op || !vk_desc->decode_extension) { - av_log(avctx, AV_LOG_ERROR, "Unsupported codec for Vulkan decoding: %s!\n", - avcodec_get_name(avctx->codec_id)); - return AVERROR(ENOSYS); - } else if (!(vk_desc->decode_extension & ctx->s.extensions)) { + if (!(vk_desc->decode_extension & ctx->s.extensions)) { av_log(avctx, AV_LOG_ERROR, "Device does not support decoding %s!\n", avcodec_get_name(avctx->codec_id)); return AVERROR(ENOSYS);