From patchwork Thu Aug 4 17:36:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37137 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp536996pzb; Thu, 4 Aug 2022 10:38:15 -0700 (PDT) X-Google-Smtp-Source: AA6agR5lTRgQHmxVBnvuqRaOi+Y1XIUpfX0EHQjS2Jdkq49kBbTGNEP4FZjnse1TIAspNx+92VuI X-Received: by 2002:a17:907:60c8:b0:730:9efe:ecbd with SMTP id hv8-20020a17090760c800b007309efeecbdmr2138802ejc.90.1659634695352; Thu, 04 Aug 2022 10:38:15 -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 go18-20020a1709070d9200b007308a195633si1182742ejc.965.2022.08.04.10.38.15; Thu, 04 Aug 2022 10:38:15 -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=@outlook.com header.s=selector1 header.b=bihpeBrR; 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 1EBFA68BA10; Thu, 4 Aug 2022 20:37:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073025.outbound.protection.outlook.com [40.92.73.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0F2B68BA2E for ; Thu, 4 Aug 2022 20:37:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TAXYs0BJeyLnfbGOjspv5EDOXYbk/X32lbsWAxd/iijF5/2SHZ9/O2oD9ME9APYfWYvE8a/8qwBc1CXnYET2c1k+TyB/jOacZ5dnToS1P4RiRtwlos7H2JGG4gXPpz/SQlFMz+llubIGADMIqGMK809qgZHQNLI5jNJmGMFp6WF8I6/4aXvqtY5glTshp/d8b/tXBtxfkVcVQ6Gw+dhz+cG+odatnvmMjjPUXXuNEYHfyShamjd0gppkelU6FD9QpFRcIKL5Hw5g3YEFi7ee8vyICeZtJ4khjrNF4fZR6riDvN3WPPviSThl9kSjg5CsA92K17wWBfqoHojB4EkUiA== 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=ezIGgesyX9TZMnnJgwZnJVth9gWIuMqIuRIQx7NFXUE=; b=ejGpVf4HS4hn4Kouauicl3r//B8blKUMLf485mtN0qf46W/9m2SaEA9GNiAFZbWvZXNRCq21Pj689dxba0NHuHghdmg+jdqfzTEP9eAiKE2mCSLLJenw2NVAFXfvJrelRM/Ctdsi8lfZUIbKCPUShCteS2pmgotAukj5tivMSUr7nvlGz46ZMf4pqULFUBaVs+lZ/xCYa7DaRn05OC7FJ60u3PuhpSxAiRozj9yWYjyyldHjQeiw/s8p4GJnvgC7/HFbynxct7P4U9iUgnIIioPyIfJM/9ESRoLtepITsJLBxbC4PlRV1I+D1YcQ6FbtRZoHVcJmJ3thiC4VFppTYA== 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=ezIGgesyX9TZMnnJgwZnJVth9gWIuMqIuRIQx7NFXUE=; b=bihpeBrRD1aiuIadddi13OBYWO2aoUn1cvXpPzbyuOJVTJWL0/GEMMHCpcQLdJRpMZh1U0aRo8tioGIlYX2Zw1lA6wMK+vjHvBjx5yeHKI1kYCGzKMVwYQeE/38x4QgmIePu3VsQnkyd6BOWRGqCYcXrG9/BNmqDeY4ycUV3DnvEP7G+oWGxY7FF7CybmPiPGc6kyw8aI4bJN9S+7esyzMjL58TpiZieG3rhtDUY72tUqENRz3pxDiFGULXb2odJ32ei7ZM7QwAgXq89bZhwPqkBmC2+E7MQh2Q1rPBvBzUBw8kr/WH75Q7YGa0KZDZbeUfo7SRNX5n5DqynPbwAZg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB8PR01MB6503.eurprd01.prod.exchangelabs.com (2603:10a6:10:154::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Thu, 4 Aug 2022 17:37:20 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5482.016; Thu, 4 Aug 2022 17:37:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Aug 2022 19:36:55 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [yV73PG85pzJ4YZv1M4C7L5J/CMxKs81P] X-ClientProxiedBy: AM5PR0201CA0018.eurprd02.prod.outlook.com (2603:10a6:203:3d::28) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220804173655.1561196-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4aa7e9ea-1165-4fe6-2a67-08da763ffb9a X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIOfcU/WhyXx+8uuhyM+VSedXN3wwJE5YqbfHbv6Ba6TbfXBd5Crw4V9eDikwb+bZ2eA5v92QIMzizyc4R+C7wdRuLTr6jH3NjFmI3BL7mmVydTJx1bcuc8GS+9sG+JLNO/O+Qm+0OlHuJ5enOE8xZkBKSDvXK+xrJfGOMynaukarjl+Sx/4C4qXNjIvoBZHSLo8HB2XWPD0HSUzU9XokKgYBYrfyJqD/auJbjJhU8C3q0LNtzl0q6Eok28YlLcpchvOiN104WdQ67lmQhmRIysRUlXJyFRufbN10rX2Z39MrzNipkrKPGWHIFh8vpwKwi0qA3vXlbXyScj8Gj8D00KXdgNmip+l597jrBXYz28KRPVqx9q14yTYvpYI2CiVrMwb8QZF57p1nkIM7gINfvE53GxRoQQwkhKrwgGt8g3/2arU0/wgcly0xmbq8gExsqfVgf1txRthErkVzgWPkppTY7hNRXo/WxBV1TjhXccjzn/rr+8x/glEfiAbIS/Hx+r8GoBOYHWp+bqMyV4G0T4Siri/VKtpcZ7HFVWYDh3DCIyEsCwXPU5rLXyRG28i+dvfsL+dnnbu3HedSmWftEKBbMvVwV5iJjQE8xeFfiQp7DFulVCoRClTCiAWNDMoNjPdOA2vLHSdjT6vL56M0kHRPDoKNlimzkStKMBFfxdJsRQODSbqbDMjJAhc2WRO4qfy2Y9JU/7TQ== X-MS-TrafficTypeDiagnostic: DB8PR01MB6503:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /kj/IMd7QLUimt2sV3zLiP5Ap3opJC7/pP+sV4sVL86d0KqSeg2ehFn6WBoqwdXZDE7vVJ83aAzwSDpvm/azFPCw2ke0/MZafWe6HP8F5SdY9NVdgF0OJbSTh7wdA+Epl2RWtgRQhfplSny3IiRdbagwxRLsW1jJDhM4XTdDewTZ0hcKBRk5oZFwU+pDdNuRcpVTVKOQhSyJ4qa0i8L+KbkLw/ml3WKXOlDeYtU9JeMk1p2ybA9KRdjxRntUKZymFFSrVxWX6osWlVOF7gDUX655Ia1TPAJxN2EwB3MladXRVetfrlVz2xYXBXqMBSCG36HxawRQTJoY+WLHxpbA0eJeaFGJUjta74GD/6EKDXOnrf7he57GAUX3O699PR4pKsEzJ1Ww6J61tJLOvFbOfpa3kNWK6UXIHgIhmQgCZ8UBeVc79rhU1V3KgxPsfEnK8h1vSvlj/WwqeBtPeZ5nqNOjxiPFt2gWaAb91cmbXXhyduHDCA5OtyufjWtSVqbDX4nYqvmP/XrcbhHn8cGbAyyNDveGk4WEhi9FZjWf9hySFd7bMoTgH43Y7iOboSOaRQ91Jn8qI/azicY7YkgFRFcIYV/cZEqWAsjG1bu1oFsbpFmsThOpykPS8Bja/1Z8xkSrHx/09ZNe1sti+ujuQw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8hn88gttSMNd2AWUfwEKDcTArzdVxwHpH6ZUSwhABlpS0UAk2Qt3824xkCiP/8aNw0sb0iQHT61gOkPXHm7dW4YQLylq/Cz5253KetYIFrSOwZ+FoSWGTvh+FUGHPTitJnQPXicSCS3lcnIcdJt57lIkWyBU3JcQMBAP2sqsDssgkaevHpF+l+7bbz6+60Xfqx5KntHvp8fmaAvYQ2y41cmumY06XMRcCc1kFgYXJU0s7WM4SWFPQOgBa5mcO6LaQObQ1aButJ9zqmxRN4djVUf0MCgIYtQ5FzUG0pDLn7pvmFlBbImVnFVSpyqdzv5J5BVg9w42oatHWsBhHo6Ctu0znuDSawr4xr3DCTFSelbvNX08pz1Jf3fpS5FjnL830aYWkd9IuKNHD7iwTbT1ILL3t/Lu8h4RYxMZtUTZWQuRTng/3RqujdhYUqlAVT5AkHwjx6pdC5eZOtnkmCSIJ8R81vx+6YQDev9/5tH/jdcAJAOvQpO8Z6I71v+TfVNtonECBgBIWy8Cki1Fg6YFY60cG8wi3eJf88+OaP+Q4di288LOEZYn/89rMerQQhWKdr/UtR98iuEHjRdnSIB+V3hhIAElSWhgVOrU51jcRuW9iDqI9/v/KsNPdWn/GONc9GCYbJzG6nlsFQpojRKvw0V5dsdXlBtNl4SmfkeaScvRjWeH2dbFTFg/2/a02mjnCXn22O+/ygLwrAi4A8+ifruT2K5HlcJ9LecabQ7Alkt1s8obbeo91/PBLhUaEDrxOku0RGF778BONEChrFRFFOdQKvZ7JseYU5E/XL42SbSW3aICkNzlZrq2sl7BkallulOQGV7LLfejsRDRRt0ymffhe/AATzHJaRiqJLJRb/AtTA1lMbFODQy/eaX41h8PvB3PUK01B0S/lX1ABqmMOaF4VPyDOLFeHITTxvFAqB2r8Ouu1IcP4JMOROpp/NONAlZBZF/BvPI41CUIMtYXExEwW3A/kEpFH6KDMOvScqvsn8aABJKVl7f8vglz/kUcUJKd/Wm49fWeU5KcB1S3Ydw3e7T73LR+n/Qcu1fe2U0EJ+UWTv63umWJTdXRZZ28jbu/gxlQRtXvUuKC7LZOAzgzgIq47hQ6by63YlKlTSQLl0WysPpukzNahKP9BwMEOXtg1vjRt4dF8VgSU+FvNrJfsYV8FGJSeJndBmFF+nHwC1NCpwn7VQRg7EYxkaKWd3EhYwx3AO6i90Bbie3Ah0XC2EhOJQsMT+rmMvginfko5XOhgNhHXDnDpViNLCt1qQcJYQvIdqz5s7VqYKUNiQHWVHVP9rVNVx/AnNPd6cA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4aa7e9ea-1165-4fe6-2a67-08da763ffb9a X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2022 17:37:20.5360 (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: DB8PR01MB6503 Subject: [FFmpeg-devel] [PATCH 9/9] avcodec/cbs_h2645: 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: Z5UHACejqr6W The functions to replace parameter sets are only called after the respective parameter set has just been read or has just been written; all of these functions check that the id field is within the appropriate range. So the checks in the replace-functions can be removed. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_h2645.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index e0c617e81d..4ee06003c3 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -666,13 +666,7 @@ static int cbs_h26 ## h26n ## _replace_ ## ps_var(CodedBitstreamContext *ctx, \ CodedBitstreamH26 ## h26n ## Context *priv = ctx->priv_data; \ H26 ## h26n ## Raw ## ps_name *ps_var = unit->content; \ unsigned int id = ps_var->id_element; \ - int err; \ - if (id >= FF_ARRAY_ELEMS(priv->ps_var)) { \ - av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid " #ps_name \ - " id : %d.\n", id); \ - return AVERROR_INVALIDDATA; \ - } \ - err = ff_cbs_make_unit_refcounted(ctx, unit); \ + int err = ff_cbs_make_unit_refcounted(ctx, unit); \ if (err < 0) \ return err; \ if (priv->ps_var[id] == priv->active_ ## ps_var) \