From patchwork Mon Jul 10 00:19:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42575 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp367298pzb; Sun, 9 Jul 2023 17:18:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlHev/3/YUgY/oOJIPwBBiKUyNq6dri6cT3uJ+l3Ezv96V0l1LbA4HppoSzPfpsGNgwZp4/d X-Received: by 2002:aa7:d7d0:0:b0:51e:65b:bc3b with SMTP id e16-20020aa7d7d0000000b0051e065bbc3bmr13373103eds.15.1688948300256; Sun, 09 Jul 2023 17:18:20 -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 ay6-20020a056402202600b0051e23250f88si4914529edb.349.2023.07.09.17.18.19; Sun, 09 Jul 2023 17:18:20 -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=pB+VYb5r; 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 3780268C66C; Mon, 10 Jul 2023 03:18:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2040.outbound.protection.outlook.com [40.92.58.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21D1C68C532 for ; Mon, 10 Jul 2023 03:18:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BN1QnrA+yuvC7RyYZl5zLcY++gyehde5kP44OmU6euyOAx+1/K031OP6VcBuTQN/WauLSPlDywK6KlIaI1eJugcaq3Fzh7cIbpUkIe1c28ZEVFZXt1QPVzRFJTQBCqisKVesydQLe0FH+CQ5y8TlFHPl9xC5qkimRDo0rC5/wmc+mr6wAUQCFtLqSpRqvc2uW8FFqVQklNW1g5OxbGXSUXZWuvNUyTjAVLlzoU8AHWOWnwhtxeFEPJNgQvSSYub+SUJKcWNV79kR38ClO/OILPEXKgWAXFD1ELI5mXnHL2/sCg0CQqv3ohnyceRQG5PKvZ/YGYVeQRCS2Q9fHZvSzA== 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=OmHHThgIyYRmMauDhjU2bSto2yHUfVPU1ggX0FAHZ3o=; b=kF06AR4zPyWozXz3zjU/WhBe+sxXxxsSAKmW4deXrj7J/IAXqaaGdtPo5q8PooSrpjKRB+pWQpNdb8TfZveGPKwX/sEXIKFAADBUzXyhKUCTY911UmuU7K6u0W6Bkc3zh8OHMrtAt4IyJ3jyqvnb8uyyjFMB5AwlqBRCNSZSd3vAjEzqADaymbrVqgRaX44FyI7gCpWl1wtQ3SpdWcb/bZROCvfswd70wePo7oyHwZJrGeO2WsrMCUrpxFoo3nsGXBEQmt18dFHf8wFixH2E7cwoW2sykAWAIj9dL45kDblr4F4e15nV3F1OnJwN/WdHFB4KZuw0uTVxjL+XzY6wRA== 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=OmHHThgIyYRmMauDhjU2bSto2yHUfVPU1ggX0FAHZ3o=; b=pB+VYb5raVrBJwDfe0/hrspNfV13G+OoFwSzbWtQ1VuSZwCMQatqmosrP15aaBxmrONmBzAlUw71INGG7yuQ0lQ7dhtUA8odLM1IMZO2HAsyeX2Tl7qGBSDxwbYuQx6iMEU1igfloezlTKXXxOXdHNFO99+qYacxru3HfGSsaXG3r9brOgUFcby0fjQA1A0WsUldil0y+sGZU/EcZuoZWIqTd/rTfq9t3713Jh2Nm4bjUYwq4SSFkdTUxPm2Wcp5jYiCfH6GYkv9u4MJ6L0zDMo2z6s4iVMItF9DTzuhBQ3iNLOhLheOLT4tlIajEE0yAPMGfY1gmsrvul1UULy61A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0309.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:328::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.30; Mon, 10 Jul 2023 00:18:07 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::8f13:2ef8:4559:907]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::8f13:2ef8:4559:907%6]) with mapi id 15.20.6565.026; Mon, 10 Jul 2023 00:18:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jul 2023 02:19:12 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [Ie4R+D7W7vnd50MjLDx9UoBMEFj5G1o6] X-ClientProxiedBy: FR3P281CA0147.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230710001912.3089136-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0309:EE_ X-MS-Office365-Filtering-Correlation-Id: dac5f6d5-5865-44e2-fa98-08db80db2299 X-MS-Exchange-SLBlob-MailProps: Vs63Iqe4sQk7zFG3yf6GRq1pc+HsyHpxRxYlfj5RGrdyQs2M6J6eCyaGSegZtjynNS+P8X8X8FAm2DiPqzePcSUfLyNANEcpYv4ScYFKVC8VIwsFJHk5SOO4QjvceW9OZrOJDycctUIjBAqmzx7iSHaqz140HhixSFZWjR7fkdn7Y8WhgeMYoOLFgwcURLdPH071fgaglBvFzaujpVFL6H9vwdsLrt2J0Vurw7kdO+uvoka1h9OlVShmFGraX+dtwfVFgmJgN2mzfsRoBCmI17kGbCub2osRmHCtwx3uPKd5tobIMDdywjfFpdz7LZJ+SYbLG/eIUueqWtH3wNBOmAJzEECU2633pXgEgdx7Z66SmIGWuOqAuo/Yu+yDjpEcF4i38BNYs6yfAcIXllUncAWRnc5CL3k6wbhucYeUP3GL4tfEo4jrJNk1ulVjqmhbRM9baO3vSCycmaGXjUKumZMWwnJYNiXOPtzg1NlgOTq8YGlx5eAjO0T7bM5dK8qJQnMG7rrwjeO0jVS5xh3xeOEygdvlCeKfxGgTJUCtP6X45Yj3yEMm0l22hEkqDqtvzB/sLP7bjWO/JWAQz4oAIv8mambT1icDSa2RzBf8DRLRTwR3YLLiucbqRlFLE2og5AdvoNyDKB766ToooXtIy73m2XjW0Lehzdl9A/7JCmkNgYaz8uR3gJiHmnDUgO5/XyK1n4dbFhamI0QXvHIbRU1+uGJW83ygWpzgFwlAskA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XfUjsq0sBe+omMXQSSpHR/NrkN6JvCnOzEDXBzqsdZ8DeiafviCkyyELFPNIPv42L0I4sGcdIUqou2hZFRSC2X9zaiFRilvIMgcg/x66JpyG/p3OUtGTJvsiYHTO5uGkFkd0E73lMWb1SKZtUf0G9/c+6n9ZBempDrv5+Do4X1SKfAWNx1+d9jsh190sLoP/bSa1Uf6eKQY96n0jBr18FCn1nZAEckZC6btBTlmmLE98U12zNpyCBS7kmfcK6ypfCkgVt4ddxSoKVTEPUSNTZKfjSDsvlEIwOEpIeMQ4fVm7hNMFt7tiB2P1ouXx0DC7AyDg+nxTje84xR1ul5wMZ8eanjW/8wYMV/5CYCncSrHhtSX9/mbxmnsQooBlRlGh2ovvNAYdxMprTFBvirQcmYwMHY2Tgpf4UZZuy75KfExa/sOfbxUpBVZq7d1g5J26TEmcr4nfdLdP6x7Uw/qF0D4UDU32XYUf+HXtqT8mGIHqJWrICAkq5ZTZOk6oj0hr6kyOjcURnZQPD+GfUByqv2iokTjFe+3FusPODROKnCNYmy5fQYTULH1lX6KQVhJb06pPbLR9qZxLvXb/uNgSHU8HT4cjIs9l6uqjmuNrlpJN8/Ghbiw9tdpdZrWXwBMA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TTumkbAl6p5T/l4xrwBQGZYQLGFKS8fZNUDSQKk0mEGaol77s4qufQ9P58cVVHz1hRnGBIG1ejyLnDxQutC7kv2gIKqBRN0cmf+yLMjBo+vGIqSLJayNobxCn2t1qp45HRk1JGxxsBJ81Ig6747+CPrcRoMwa0Jzt8FkhcoC2Juexz1Eq4eZIaSXXR2tI8hg7dPwLBiMIV7XxqidmvWjbChSorbTvkOxw03cKjjrI9HElB+zU8kKMineWhOdUIMPZMZw9kTzP8GLfbigGwQ3acMPlZHJdfYnImAvRfeTt/LDbHKbR1jbpTGFPqUfQjV/cdTsLcn4SOBrxzhf8/UYiOXfvJSfCNvE3qqOevAkARR4amfOayjCl/cTBG3R5uKKwFbip5agV8TIY8DOn8906pxyLtw2BUTvB/YU4PTmlIaH0dQgNpTWwyz8o2XdRJM7LjJiKd8kYRnQHRQnU8hFeGrxilHORic1ExeKmJflb73FIyrKUmAaCUCoij3mhMgEXZ+SRchzbodgGvXOJmcORTSjxDosPmiVl9PAXgfiyRtVMJ/iytsQRDCdtgbWQj8NzJE5Zehh2YBv2V1/0Al8gVi7vEYotIHlQDztERxIbNjpa1iFjILbygmn+7c3Kz2dHvPMxu518QMDM1kSWdZjIpw1Eq5UCLHLrTiXOLiS8x/FiwL6V1zN8VqZsEre/goheZ0CN7ELjXzS723itpr9gOeBU2azcQOpGHRggJ4xF28N7JVn0jfl4iWWPbWb8dDgpDSVNpTVSRR5H07tGRBe7Eh9tNJtzq3twgSK7P4KW9lYjQMCAf+lybe1Nz+hA/gzE5ptVCt9jlK1HTOONv6C+//fLo9AKR6AiQjucjBiUdWukk4mY3l9DBU8B5cejZdF0V4nG7ZxbPr/lLqs8ApAxear4i3DfyMN0ntB0SQAUoWXCAp7mCBC4bM9e+H4UDL/Inm+79KrM4dFzejKOgJy/zipGEs57QYIOYqKWEbdusuJk+htUrmXLXQnfAtXSOoydREj5eUF4P1ayUa5htkyaSl5mDVX6aHmvF/0QFg5UQdKufwHZqwvw2DYx4FoAH3mH5Iweo9YPBO18ALYkpyJIkiEpgkHD+alJD5K4zm5FLBvLhLbWq2Fn8BzW9R43+tSecDkif2Q3CAYeKq2v/W3Zznj4CJ7QAsGvfaeJJUTHxgruzoCHgNPO/mIrjoJ13xAluWVVX4nL5JGdU6+ibThuq0rooybRZVzqn9g+MKK7rsfyekm3LWYNAnPi0pJqelQ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dac5f6d5-5865-44e2-fa98-08db80db2299 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2023 00:18:07.2510 (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: AM8P250MB0309 Subject: [FFmpeg-devel] [PATCH] avcodec/hevc_ps: Improve PPS SCC extension bit depth 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: vvpqIasi7qeV From the spec: "It is a requirement of bitstream conformance that the value of luma_bit_depth_entry_minus8 shall be equal to the value of bit_depth_luma_minus8"; similarly for chroma. Should fix Coverity ticket #1529226. Signed-off-by: Andreas Rheinhardt --- libavcodec/hevc_ps.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 4c4c1e2c17..1db2d3a242 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1581,11 +1581,13 @@ static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, } pps->monochrome_palette_flag = get_bits1(gb); pps->luma_bit_depth_entry = get_ue_golomb_31(gb) + 8; - if (!pps->monochrome_palette_flag) - pps->chroma_bit_depth_entry = get_ue_golomb_31(gb) + 8; - - if (pps->chroma_bit_depth_entry > 16 || pps->chroma_bit_depth_entry > 16) + if (pps->luma_bit_depth_entry != sps->bit_depth) return AVERROR_INVALIDDATA; + if (!pps->monochrome_palette_flag) { + pps->chroma_bit_depth_entry = get_ue_golomb_31(gb) + 8; + if (pps->chroma_bit_depth_entry != sps->bit_depth_chroma) + return AVERROR_INVALIDDATA; + } num_comps = pps->monochrome_palette_flag ? 1 : 3; for (int comp = 0; comp < num_comps; comp++) {