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);