From patchwork Tue Jul 26 22:08:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36996 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp234177pzb; Wed, 27 Jul 2022 02:35:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sP0Xvi8v7a0LZSi2QUr/dcjev8dXFt3Y96ASvP3pRhAknYCEhtFYuaKTGyPOUDM2tH17u+ X-Received: by 2002:a05:6402:3219:b0:43c:b636:6a20 with SMTP id g25-20020a056402321900b0043cb6366a20mr2108585eda.96.1658914543052; Wed, 27 Jul 2022 02:35:43 -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 nc31-20020a1709071c1f00b0072f390774a3si21383143ejc.61.2022.07.27.02.35.42; Wed, 27 Jul 2022 02:35:43 -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=CXJldpyK; 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 8458268B808; Wed, 27 Jul 2022 12:31:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2102.outbound.protection.outlook.com [40.92.90.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B3AC68B926 for ; Wed, 27 Jul 2022 12:31:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=THa+gW1tpBsLuGH+w515QHBK6V0L04iSu/2Efjdxgzfn0lYp0OtjH6mq2GnkjWk4trgf0u8bpZRUnUKw05WAH7bmVWJN2ngct5q6oRf2pKyYc6LNALlnu5xd2OX6N/oLX1xUuarD9x8KS5H9djJ0PB6X3idgiROlaIgDP59oXCnYDB4HQQELL6DDVFDCop6u7kqdUahrSilL+5xw1AY2cYE6+x3tmXrudoe4vfNSI5qXJFSS5IgaeJnZhw0q3npGl7JccPRaf6902aXsCarElk+rkJcv8o6SWGCxxb8zJX0ZHJbAtlsJJDwkrqUXBGW1xO/Eadm5zJX3cn1ayoN74g== 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=aG7i6Ywvu7sR68NJsF9o0IyvWZMkPYskVSNbswoZ4MU=; b=VkKT+mVki1k3hr/iwEsMCoCnqjWu0gD5768x5WCCsdLOxKQJpUUgC0c33iEOIqjVdfMkwAMOekWbiChd3osDT/tmcp2Fvy2y9uxpjWZjGT0w9eVTwg/PcvRy8sCDDk73l4F2LKIWkMepFyQHRBlk32mVEIAiteeYrsN1kV07+m4vS4p8JSgqlZ9vFLTlquF5zgfvJ2lDm9SfYzeGEl3a33CjgJUvNPbSAN9mYnMVXmtzgQX7VUkkHUP7lwuRNx+2Frj/YA+dVzQIDTwaJS/BY3Gb1uxasu8i1N7QhWvo16Lh2Cn/lDIndfYzA3UdXKZHiAQt9BtlKNMnJm1iL7lsZg== 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=aG7i6Ywvu7sR68NJsF9o0IyvWZMkPYskVSNbswoZ4MU=; b=CXJldpyKLQKVykAi2PbP+YDCIwMvMt4c6eXlCnWbPNeMgmvpetPTneAalToSs9il7X8cu3VJZkr1YlBnLWv05BpVQCdcBJzx7jPMLdI5IqZ97XgoS3hM3IiVeN3p88TudUqSPQrk3wyn1Uyd/sEh6VR5iLINc5/bAEaZKu3wHBeWAtG1lTwMxJlCoTPtA9rORmfWjHjVFlqoXKZukVjuzGAyS+7beW6jgTqS0f37yO7PYV1oKWyVY+T2/+Ej0RFL5ORatVwCx+Ce9Ohu0m17TJA6m9ir6Jfjz/fE0+urzHYYcig2bWeN384Kqi++rJ64m380empMzMLcCSQ9ohq3LQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB9PR01MB9174.eurprd01.prod.exchangelabs.com (2603:10a6:10:366::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 22:09:32 +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.5458.025; Tue, 26 Jul 2022 22:09:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 00:08:00 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5quDOkSB3ErbsfYkGyYWY1cTIOCuiQD3] X-ClientProxiedBy: FR3P281CA0157.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220726220814.695563-24-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 82eff1e7-71d7-4f2f-8818-08da6f53848f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQG9fQ4e5wexDZEKzsZPbgBvlQf+1LD50UP5lGdVw+R7uoWv12MRkq08KPD50SpFRv+s1jXaNEOEl4Q0gOuyYfNq68oKUx7/NANJgBrfNI6IG+m+an7en5z0r2MPBK/Ad+7AprvTGRqkwFzVgiD65vrcL2Ttgu2DtQKqN6KtGAjgfnlH1NEmdlQTHu9nHK+5IM4yct0qe5UknWwrgWdl7Ws8CtpeHRPoSscBgU/DxZNXIkuISHwicy8pWN4ZQ1rX+IBUSPy/eBs0biiU9oHhMLnJytsin0nwrUUvZ/5o3NcYpTHfRBw/jluAHrUnTEXhmlOipFvRqTubPdrmXOQBhz0f4Y8py4QUYYdjZdo4+bBKSNoUHgvRTlNT2gUEWU8z605Pq7kY6zEdu5uqBpUCCaKSzzIvJcw75N+ZkY3RZUAinNUge0cgV5jtWo9e+jLRnWt1L4XQTJJc1hspEFMNtvfypIwFa3CZzzKnuSuwcYLQfJ+ZY926tGNPd1CxCXQr4RsoyPc3xhAG1mLVp7tvwEn45tG5n8JN4jAVEGWFVJgopJX9Fik/ICc/6Es0SIZlxmUYf5oOdc6yRptxMxSMCyE3WqBEjJiXxVxZGo6L1wCCV0STMLP0UtpfWT+lmzqcFCLra3V18FgBxrrPAttNnQvzaFQuNzJOepq9P+fm7wlDkqIHwfkWV+4JiLlGs8wQdPGXbzQ2u0jGTYtCzHvfYyly6UzEehxcmLyEpYs9iEtrMoUmr+Jqq6XzdWFskhQWV8= X-MS-TrafficTypeDiagnostic: DB9PR01MB9174:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hCAB87m2kP+no2OHcLBJKGHQbKzLglzXm2m+tGtp94bxA0hHbLpAL8h+g94eVjqLc4UVZ71F6d7tu4AOA96MiX/c2q3aaCsYN4sx/jbgRUXdBuWu6mrD9BcoZsSXMKLJdMFXiUvPiuPkocfZ8GCFqWANs+GXXSTYi+xHwEgGFAXarWibaiqiCoLVapVuwBEEKdzzUoTyewpkezhps61+7j1gBcoPHxUe/SeN38HPGJ+YjrG2EchCDJuOaoEVW+irfWGuNQTDxboPkNzWB9REqK6+91PR6cY5nI+KKqO/p1b5r5b75qwt3G6CTzNZe8ZUbwrXCFttf2cL6jZMylYHSyrksQHWoYI5svAmWTTjS3+tGaKXhjNmo5WmO3pAE9moSGbase/hUjizGTZm6G7jqGu4UsDVVWIdreEMG71XEqvVMnWGhwAIrzADTAg6o4YyUiwgoke1zeDt87r/WMMji1Lhcpn6OeF9fPtdxYTYnaqPTXfeWcGr/exLcieyKNxDVQPV5Aviwai4bupC04h6kq3ruGPenhEG/0Wj0i4ckEoseWiUZ0NBtjoXdBMwiXvlQkv30FUKeyxjwgFCQ3WE2iKt99AOJBh6ZVPUxAPtKtBsd8uJTJKaQy32b4fxszsBpXUqRXI+P7Q7Wrah1TTpyw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: E0UC90o7vYZgdCiaRJ+7r1JjCAt8hqSzUAsroIDyLJH39wZwug5a4b+CmGszBPdTQ1IPMyypCPwkY0rrmWs6SHzCfjgPA4GpqQbXR/1Zsdq6rmfq5MDCN9y7KH1FbvKjSxFpTxxG2+oTEMfZYRfqj98nDt+A5q1Ghi8ejRtL+7Mq8wLEaVRu6dqrhmMjHm88Yx2FSA6gkFg9zjKi/UY1tgaAM+Oa8xqiT1U6tiks5K6m091zIkbvosqVrIcU5UPpVcslh22kCtQ3PdXUcnNNBAsw9cPyWDSlKzT1eBY1MkHRx9WwhrQPWo7+qSATw7tmVsvrI1GOXbO7I51pZjqY6wv3XfY24nJO0ior3cZol/jrygv0QRzxG0r9ZM6TbsSgN4w3d7mu4FvS+6q/4KxHjmZGJWnaisAGGzszwjFiNWiN7kJh3buxVXsY0Qt2NMq4SO2+/kPdP0AMIOyHY34OwTcgEoo/5BYx3+qcWBgOqNbuItmBTq9NlNtOMiuc+rGL2G+pBCQg+2u4TGzSoNLK818A6h89q29VJferDKqcyVQwJmcaGd9CIUsC9ZqLzUwKGGHwiztb32ZUtGfc/RkB9STgmughhxUEil+b7jTdbwGJ4hg3LHLFOK3x/DmOoOS2qoPbbyDO8LWXGth4fjeaM/eE7K9ca0boHOdorCptRJoSgEg6klrGycfzeCtc5rp//libS1VXw8CEpNvso0KC/Z94f8A+tOl/6MuuvWp+vg/epPHHIeyVrGtDxZHQG3Zfnd7KT/GNRxVTBKU3GMe0so9M6inILx0WYJW1Ct1wGO7Y/Hjnc1bEqrpz4Wu47cesoz1pz2+YMWtfyV3dDdiD8Z+df6xRGPkETzaHiSCsH5Mc3b0hmAGBsCmbnx1IwHaDrAXZ4E9JkRmE2PN8K6EujzGEvwmvhBM4erk7foJw/V4eSXGmfQJKvlMEgt38Z8vPELZOq/cqmTWiy7KGm8TnGyhg7xZQJvUqCapNTqzZJ7aEkagW4QYM1KY0cXWvyFeTAJvErf1ER4Lk1vy0SApFdHfN+eW9hyuHamPzoJz8LqOLTbYPZRNpIO/+kSXUf0LIFP1RIuyxR1gi3AWx08xMafbQAxwliVS4Wf8TdVxuzqrq6aYlXixEJ+drPJlWyDCY2wM4b4viQPWWQo2M4FKE+EyIKrMmW6zzYN9wWMQj/xF7tBj/qlsrlybCC5PUicmxnJ/FJRyhyV4O2ZcpaZWJ5U1FJ8+boUZ3Owddpc9olI/wPmKCeE87geebyFErUFCvEn4Sh5inri1pCdPF6LcTlsSXGNB2KPMSQU2yr9J9qdE= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82eff1e7-71d7-4f2f-8818-08da6f53848f X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 22:09:32.5657 (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: DB9PR01MB9174 Subject: [FFmpeg-devel] [PATCH 25/39] avcodec/pnmdec, pnm_parser: Improve const-correctness 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: VjrYwE6Podv4 Signed-off-by: Andreas Rheinhardt --- libavcodec/pnm.c | 2 +- libavcodec/pnm.h | 6 +++--- libavcodec/pnm_parser.c | 8 ++++---- libavcodec/pnmdec.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 605a529622..aabc788684 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -38,7 +38,7 @@ static void pnm_get(PNMContext *sc, char *str, int buf_size) { char *s; int c; - uint8_t *bs = sc->bytestream; + const uint8_t *bs = sc->bytestream; const uint8_t *end = sc->bytestream_end; /* skip spaces and comments */ diff --git a/libavcodec/pnm.h b/libavcodec/pnm.h index f109d16239..5bf2eaa4d9 100644 --- a/libavcodec/pnm.h +++ b/libavcodec/pnm.h @@ -25,9 +25,9 @@ #include "avcodec.h" typedef struct PNMContext { - uint8_t *bytestream; - uint8_t *bytestream_start; - uint8_t *bytestream_end; + const uint8_t *bytestream; + const uint8_t *bytestream_start; + const uint8_t *bytestream_end; int maxval; ///< maximum value of a pixel int type; int endian; diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c index 6607ac7e7f..74f918a94b 100644 --- a/libavcodec/pnm_parser.c +++ b/libavcodec/pnm_parser.c @@ -65,8 +65,8 @@ retry: pnmctx.bytestream_end = pc->buffer + pc->index; } else { pnmctx.bytestream_start = - pnmctx.bytestream = (uint8_t *) buf + skip; /* casts avoid warnings */ - pnmctx.bytestream_end = (uint8_t *) buf + buf_size - skip; + pnmctx.bytestream = buf + skip; + pnmctx.bytestream_end = buf + buf_size - skip; } if (ff_pnm_decode_header(avctx, &pnmctx) < 0) { if (pnmctx.bytestream < pnmctx.bytestream_end) { @@ -81,9 +81,9 @@ retry: goto retry; } } else if (pnmctx.type < 4) { - uint8_t *bs = pnmctx.bytestream; + const uint8_t *bs = pnmctx.bytestream; const uint8_t *end = pnmctx.bytestream_end; - uint8_t *sync = bs; + const uint8_t *sync = bs; if (pc->index) { av_assert0(pnmpc->ascii_scan <= end - bs); diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index bb2ce53496..7cf9886ce7 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -52,8 +52,8 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p, float scale; s->bytestream_start = - s->bytestream = (uint8_t *)buf; - s->bytestream_end = (uint8_t *)buf + buf_size; + s->bytestream = buf; + s->bytestream_end = buf + buf_size; if ((ret = ff_pnm_decode_header(avctx, s)) < 0) return ret;