From patchwork Thu Jun 29 23:36:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42340 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp2107242pzh; Thu, 29 Jun 2023 16:35:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlGPOizRHqv5Lec2YFaQpqWJJ2qqzpR/qVbl54IdcBDkPh7QkglcYU6Y89SWKiaGyPndQN/1 X-Received: by 2002:a05:6512:acc:b0:4f9:56a9:b98e with SMTP id n12-20020a0565120acc00b004f956a9b98emr1005803lfu.58.1688081728097; Thu, 29 Jun 2023 16:35:28 -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 r17-20020aa7da11000000b0051de1341e01si1176896eds.228.2023.06.29.16.35.27; Thu, 29 Jun 2023 16:35:28 -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=ZUnCfmPV; 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 D414F68C21C; Fri, 30 Jun 2023 02:35:23 +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-dbaeur03olkn2106.outbound.protection.outlook.com [40.92.58.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9093D68BF89 for ; Fri, 30 Jun 2023 02:35:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eFePTG11PJ147+mhiuLEMPFiZxoG5vWoLd0DoMLzTT+rlo7qf+DH8t50FZAKNIAxjohkpG8MCTdIFzSkVWQ0HvB9llhLnFqPCxYDLC7ZkBEHc6H7SIYhNP12U+/VDNwm7goLsFJwAA2F+RQMAIyHQy4Vt/XhMwzzG5coN3AgdcYwKRQqk6vQ5CaTp9x9lI09xPgNBRDbCsk5rHHwqUbAvpB8GosxZ4llvbo7bY8KI2pM+O4ZwexCFk6AyJCgo9twOQkyQrPnVf5BlN3yodZB1faMM0WjmBIjNxJ30TnffK2NiAfA3KVgrLwuy5Lm0Zq50mxFUmihMr/WPwTilF5qLw== 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=O9lunrjE0vp4zzNoKyvb+dhW5JMQeU5154137ZTSYmg=; b=OYRt61Xl7T7ldLeRwb+hh68IC4bvkSVqgZVCTRNyfolHmGvIw5IZumWZgDn5F4OD3wcwf7y37rLcSgeVpoFN6k2dDp9S8EfMLlqQx9V8y6J+Mdwi9mEKgle4yyEBtbPx8hcx7Qf+y5RHfTX8XZYNXfDxJ07VhDpQj1lEStz6kZ49lfxDnFg+umYXj/O4COoum2f1CKwpkVsWdvuODli3ZDCUcZB4U22klh4ktr74BzbHMZNP8Zr7/oaCrmlPpixab5aO4VbQWCzJKEI/72WDUft0fEKVcZrr8rQ/2/vaV/QarKAZrjIcsIPfPOvn4rlJ7lJ4aC4+F+u22be10rBiSQ== 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=O9lunrjE0vp4zzNoKyvb+dhW5JMQeU5154137ZTSYmg=; b=ZUnCfmPV6T+x1xNgLKOFSRf8c4geKJCyCd3zufBXdfpuEpj4nQq3rEMxR3w48LI7M5o2Z+kVg2cs647d+aUpJsUvu+XO/fnLGE4Xs165WRXWV7/azty1C3HjlcXWFv4/6HiHJuIpvra4gizv9Gfzd4tfDAm/laKUFEnpoXaw5e1URqZDSz1DbNk+O+kVLYoS0MgsVe4JPS4b0oR2RXvfmCZlYz/XTQMpPXTBM3lzEvLA4uWIRtVgrsxLtvyd5DhUYKp+c2fjdxUPepiBO5u/2kAYrFCeNhr1Sh/FuV7ji7JZqi23GMOfcpTSP9+NuhZwDxCondcPzI1wljZt7yq5gA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0108.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.19; Thu, 29 Jun 2023 23:35:15 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::8f13:2ef8:4559:907]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::8f13:2ef8:4559:907%5]) with mapi id 15.20.6544.019; Thu, 29 Jun 2023 23:35:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Jun 2023 01:36:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [RsLZpx8RT8H8DnfJF906oInOR2vFcdLg] X-ClientProxiedBy: ZR0P278CA0168.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230629233617.903890-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0108:EE_ X-MS-Office365-Filtering-Correlation-Id: 256e1d7d-41b9-415a-d3b2-08db78f97d8c X-MS-Exchange-SLBlob-MailProps: znQPCv1HvwUykhYCLh9DY0KVirLrnEbs9DmGxwmaVhUGiXeOi2ThNGDyEWx9ISYrWYUtwQNf0gj4LT4lgSoLrSNZ2wp2PaZ9U2otAKB2MHSDzeZjXOtdXSXuzOroIRDxDsV6XVWzdGIvT6WRM2F6CUMPg0V6cuTYPijchZoiVR0Hq5xLitxhfWiSfUCATzAuvRy4dv1FH7Zva6ydjlsnygkETDUbmIKHJvRhVINO2Pm9XUY5RQRdxqGZSipqzCFLP/lprqTKlgIMUu8D2Mzdfx86WaH0z2qYRbdnRFurmO4xnxBNZ3il0WWg90qQKT0Lu9OdVL5ZC1549wud7kJagsbq5tzkEgY4fC8GOdPhLO4Ujv49fxanXzWskCnd1QKT1fsvVCowqjsndgEcP3mFXYfidbvJaazXWyl7h1GDmVs/rJwLSx4IR36gvli9tQinN53Xo5hw05GWa0rn2cPd80n6e42ZLtxsD5+umvQ/fCV/3LlCNRFW5fth0+439cEBkYGFuC2F8u+F4a+mngYSnv0qiTVvclDcjowObmBwUgdF2W4pTKH0auigRLAuuK7BZaDfII0SO4HKoRDea7lAFEkorqJO3s/2NeLeYVAm7BiTXjKCZT12e46pg3gH0+8Hnf7qBnuiD6bit8wqug98Og2hk2b65zLENpT4YM6zdY1aTe+kOTydja42PAmu5JW96pWNsRecGFhZdPqfWygVt6im0u4farEH/7tERvg2tHLxwlDwn1TwhCbAC7rsGCCXD2zWJzYGcdI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8o89iNWHDtiH0hz8L41hwhjZiK7z2gMzhXWSwthIw2WlsIfOCZPKQb2F9ZbHT2UTH97vILCzUsdXoM6by/G14RDBqukC5BaSJjV1tzlmZcPJvX3PpJzDKUfDIB5o0gZkZ5LIAXKB+C7XH+NypN9fTn3VPaFT95LYpV0MwhcvpL8wIsLrQgGBT9Ys+jYGToVzh/enANsWhKAGQNUcXXFnDryW7qcY+sFO1zDijo7d2HpayPO6rNeA39/9ClFVGWWsI2O9cXTVRgbOjw5GBoeNxq6w0mhKAiajYMMuCTjTrUBGpQD8DL4tI39HZ4lShWZMp3KCqa5kjX4AhxdmLMOT3d5HhaY4dh9urr64TACq/zfkDrQhb4fbPsvVFgT1ee8NwmLAYcf9xPSKK7creeorBeuASZ9/uWULPWqnri+hJ59Q9/6lOrpfcWk4XFj76AAlyL8OYWAEfEB7LJhUS+oaExjcZo3Y9ODPT3gWUx2Fm6BBW5eRwyI23KY7ROkBw+n1Cf+N88y6GENeAIlekBVqkjTap9cMOL/eZaaU19u/eaQ+3y1UZsije1NtwiQ8j2h734p/kLmZkxUARkEbO/0bnQjwlxfpK1h8Q3Uvj2QQpt2KSE95PcttJGF0wGlRgiGf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vJnxR/SO7LfHHvQWrr8NYKJjRSf4pGDp5QzTppTweSYTfIvDvrfFo/eO/YDzgFibEY98HNNtXHdeTF7JpqUzF3i5BXnKHORrWN+DpE05b/ewkKkHJK4sq1ajdDwiQNn9phzrA/9ep/1v2azSSLcijrbi5uC1NKYZmlezhybYhQKpyFVreb3QCT3p45kLOw5YC/eTUEvjfREm2xNWTF6TQbbjJ1MYWv2KI0cns6kL8Y6opVz0VKdv1lYsT5MDlppu1mVOK7DwlCOlgsBrNLyLxoyW4Lj3crtZpKF8huwzgZJ/f1dZzuTozqnmRwgMjdxMYdi0pkNoHUrXyrjEal92JMaBBBb2vpNiipRe3jjhXFqky3Hc9JMOQe/WwrLzrbF3lIST0KDQEWqzXX4QuzAc3PccInGQ4Erc23it7rpPc+SnQKhCfxe5rxhRRYEBR1QNyaseMJ5G6+DfLjelGw0hSIrSMR9NcajO/Nf1dHuePkmWpNfSxyDHJ35kjPAQJ+MsKhuPU4bUtec0LAilwDGOpYJReJzEXIWMT2DwFYdTnzJEySPYrq2P9ZY90EzrXXjWly0MrQcKk7h7TBA4KYK9wvWHEgew6TpxyrAbSBbDtd9CrOu4AYNH7w+Po2/jKCsYyqCEIV4dUNoRzKBLKbNuvNGvzWTU21YGQAZq8T7Lw0OanFRn6JPgAm5WNIc8HKah+fHRVAV7UPGzw4h4ZJfhMZ0MkXuLTylfzL5h8nikKFDlwtuf03wSoiKHydeQDG4GE0uvfp2R8dKzeRWaNxfzj+omXKFMUnnWVZfu+J1X7J/uRIOOdH2xxBCRwDmnReuZ3zYfSZwJjiAwcUo555DoXDvomIh8J8KzKNkjpiSQxl4FCgnb4Zp7UZIUjsPiU/3i+EUaPBzuBoDqPVjsfijYzfk6qA6fpK+wfrfPkKLTdSgLgWKmAXHdqac+L0Uykjr+JQvuTOMLQU3BzVNdVPwfomqXRzZ9mTz3dI4j1S00CsWR9o8kF4LJH+ZyiR+jVHLOmmimwTrcYamOz2LUzOYVGkR8d2H3cLz5clf7IFr5gxozYh2i0RW63Kb3s/dFg5IYz+S5TM91LygIuaicArOERCW11EOwfjGD9xtPchXntHQ+/ICfn6VX2KSYA5gv/zamKkP0jL908HZVVnYsAdXzsef+MXYkIgjCC+Nh7HjrewlogkCbh2YiX2F1RP4gFhWX2ymKjfkEP1soJQMIuHDXEFLnjVqSdVxksrUqw9HpUY9mqvk2uccyhuKYuLSocdci X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 256e1d7d-41b9-415a-d3b2-08db78f97d8c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2023 23:35:15.6054 (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: AM8P250MB0108 Subject: [FFmpeg-devel] [PATCH] avcodec/hevc_ps: Constify VPS, SPS pointers when parsing PPS 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: de8skms3GIy0 Signed-off-by: Andreas Rheinhardt --- libavcodec/hevc_ps.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index d7930d3ac3..4c4c1e2c17 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -725,7 +725,8 @@ static void set_default_scaling_list_data(ScalingList *sl) memcpy(sl->sl[3][5], default_scaling_list_inter, 64); } -static int scaling_list_data(GetBitContext *gb, AVCodecContext *avctx, ScalingList *sl, HEVCSPS *sps) +static int scaling_list_data(GetBitContext *gb, AVCodecContext *avctx, + ScalingList *sl, const HEVCSPS *sps) { uint8_t scaling_list_pred_mode_flag; uint8_t scaling_list_dc_coef[2][6]; @@ -1412,7 +1413,7 @@ static int colour_mapping_table(GetBitContext *gb, AVCodecContext *avctx, HEVCPP } static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx, - HEVCPPS *pps, HEVCSPS *sps, HEVCVPS *vps) + HEVCPPS *pps, const HEVCSPS *sps, const HEVCVPS *vps) { pps->poc_reset_info_present_flag = get_bits1(gb); pps->pps_infer_scaling_list_flag = get_bits1(gb); @@ -1483,7 +1484,7 @@ static void delta_dlt(GetBitContext *gb, HEVCPPS *pps) } static int pps_3d_extension(GetBitContext *gb, AVCodecContext *avctx, - HEVCPPS *pps, HEVCSPS *sps) + HEVCPPS *pps, const HEVCSPS *sps) { unsigned int pps_depth_layers_minus1; @@ -1507,7 +1508,7 @@ static int pps_3d_extension(GetBitContext *gb, AVCodecContext *avctx, } static int pps_range_extensions(GetBitContext *gb, AVCodecContext *avctx, - HEVCPPS *pps, HEVCSPS *sps) + HEVCPPS *pps, const HEVCSPS *sps) { if (pps->transform_skip_enabled_flag) { pps->log2_max_transform_skip_block_size = get_ue_golomb_31(gb) + 2; @@ -1547,7 +1548,7 @@ static int pps_range_extensions(GetBitContext *gb, AVCodecContext *avctx, } static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, - HEVCPPS *pps, HEVCSPS *sps) + HEVCPPS *pps, const HEVCSPS *sps) { int num_comps, ret; @@ -1599,7 +1600,7 @@ static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, } static inline int setup_pps(AVCodecContext *avctx, GetBitContext *gb, - HEVCPPS *pps, HEVCSPS *sps) + HEVCPPS *pps, const HEVCSPS *sps) { int log2_diff; int pic_area_in_ctbs; @@ -1733,8 +1734,8 @@ static inline int setup_pps(AVCodecContext *avctx, GetBitContext *gb, int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, HEVCParamSets *ps) { - HEVCSPS *sps = NULL; - HEVCVPS *vps = NULL; + const HEVCSPS *sps = NULL; + const HEVCVPS *vps = NULL; int i, ret = 0; unsigned int pps_id = 0; ptrdiff_t nal_size;