From patchwork Mon Jul 4 15:25:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36657 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2900904pzh; Mon, 4 Jul 2022 08:26:05 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sHJq0F8VKU0doF4/VltcGGMmdzg+HLxfM3TasLfOhePxv+P2TlTxQuUAeidxxJR9qmXIZs X-Received: by 2002:a05:6402:11:b0:431:680c:cca1 with SMTP id d17-20020a056402001100b00431680ccca1mr40780725edu.420.1656948364787; Mon, 04 Jul 2022 08:26:04 -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 y15-20020a056402440f00b0043578ded62esi13473708eda.352.2022.07.04.08.26.04; Mon, 04 Jul 2022 08:26:04 -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=EW6f+MuS; 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 A9AF668B945; Mon, 4 Jul 2022 18:25:52 +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-vi1eur05olkn2061.outbound.protection.outlook.com [40.92.90.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AC5168B92C for ; Mon, 4 Jul 2022 18:25:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aqOqJEaKxuKlirIeUaiLIjXRom2Pw5LpbcPVp+65drKrg8tC4cPi9l4JjYQUEEAD7zpB9M6vT7W939ZF/SmK0CDcXlXvfmWok1jpsNEl5AJzaWnlZKJ3xsP8wnu91OVExotSgi2FG9uSw27iB5KIW9pbnFTl4/vtbuj5mEi+SxbdjknD1bgAIi+zgftkzljKMXW9W6skgD/BSKpNECFVnVgmjGJXn3rkE9Cg39FjE014kEzrWLzKK/vqL7AnRYdcpdFVQEpdotq+bUn1B6nYUEMVw+2PtnKJy07YBlER2rU1hlPCsLbDQpkWx1MKVxSSiWv98irrwCKlVVl5BSDAwQ== 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=NNtYLezTJ2+7d9VfHIEIFXNajMNH4/AR5MAKLVXxdfU=; b=eDA5EgAClmnqdCuAnC0mGxn79U4HOvhhHCc5ZuX9RSym5Vh8kU99IVQxcNv164c0EzxB8TUoCxkyI4dNyhHJc8apX9JbpV6MWu3sMgfsby0R14FVvhtAtNpGRREBsE1kHj45i2Ejlg4wHJY/+umTFrff8AVIrw5FMOjx2pvDf04gvNBveEM+rr8hlgp6GlbkN5kpKDXvieMt+BGCBkc29WSJJoUCW5KPhuGu5NGey+shy/JE3rLm8JX1xIrfqbfpIDrO1x5wRTUzrgCWJMXNjMJyCTTyU//S1IcemxAyWSvvYItvC74Kq4yPyPMfNfTGPb5auqYPSLEfmWwQYr4gXg== 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=NNtYLezTJ2+7d9VfHIEIFXNajMNH4/AR5MAKLVXxdfU=; b=EW6f+MuSqtbZ2RDtWjlnHQaLUz4rHwLkC61MMnYXHEXbfPzXzJOdS/UWx1J7bpU2rUxYAkgnlVcnwpXQoCAX4atLrRezXNPXruQOxd/P5u7bpfY1B/Hq7yz3/0xIRIFfPJq1TCt9Z3XPPK+MhZmVEfCa0YztVeTRSYdwFHNnlI+VKsoYnYvrmTio47u21Iq39YbesUjx5qCvDKygy0vyp7amP0i1HX9Doz5dmGzYYbzlsd+PxAjqeAfEpN95xHCw7MSDZviHjCcED1ru1Dzmv8p6yATx9NJADNAyQJIaQ1Maf47KCGjNsT3jMD9OR9MhrYSMDODop1+BUcaNvAvJZw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB8566.eurprd01.prod.exchangelabs.com (2603:10a6:102:22d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.15; Mon, 4 Jul 2022 15:25:32 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5395.020; Mon, 4 Jul 2022 15:25:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jul 2022 17:25:20 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [xsXDgYIYsNts/jaUbygKLLy1fYWHD866] X-ClientProxiedBy: AS9P251CA0017.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:50f::22) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220704152520.1106645-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2456452d-212c-42c3-7036-08da5dd16f19 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUxDAI+Tg+jRSc79YAuptYJS4hF1vgpdIxvj5g7wlOqY6ppOytkeSQyue/1YGzw/FmHe1ftVvQ8xai+0ztqVcL2u1zzrYGQm4grC+K8tJ7NV0motwQdcGB9F8M+lWKoKaTiTQor8bkvKszYOoAoL5J2j5tECqmC1RiLPHRNMYBbk8+V+vnXFvhX2V5DGR5MPkDlhlrogUjQxfZpOuS8MCtSFznVgLDuy9o3Szv4LmCvDt5OWEUBJ4JREuEC4EBBZCVu5D0mVOPyqfu49aLNaDpwfBewwhRUededO9J74hmOy1ZXxiHfMFkjLxTWAsNk7YqXvSH52Z/CptVylPLIu0ZuHB3MUfpkpxTmeX9EWUMrRWnY1jnn0Vv/irQkNBFDwTUbmbcIATMUgRexp0FJubfxgBduFmfj3IZCH9o3ZE+jS9N/ld1HbBymLjwYa4QnPiU8BO2+IpsjLSQiEs7otlauKjaUAtCrp5O/sAaJmnyKXwMsQsUkYw5/aRpAgAxoYajEceHAc/eK4Pcq0v5A2NZ0AIVawK5iZ5hvM75kTIvPOWIN3lA7tUZ5jtJ3vYwVZC1zUn/vOYPzrKtJRR33bv6ANHhp+lznTgyg9vS4CpPe3dPKdfI/NV4Be48dPP85CmHfQ73FVFu21h5hbXuz6RcOFnPoGUkl+Eb8l8PnOmFRKK3PTnpZ2U5XO/nTrRiTNgAegCxLho32ZvM4+GcbF7V7gOO2qo6UJWY= X-MS-TrafficTypeDiagnostic: PAXPR01MB8566:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZLpr/UU/tTwkohUwYzCX/XtOpDqJmxnERlB35qjiBVf3LCfs6+m0V8EQ0u5ngU3yLmJvRGDFW2TFHGZl0RSFqM3wXlrWPlLLQYtD7tnkVIOo6K2FjZtC+zFiUPvtzM95xo/E+LxLZRlJSYO/W5NAm5ZkB6qGj6aTTWrZRRlRuXbdGL4uCeDF4qYSf69dv1rTDdzgcernalH1MTyZiHJBFNGIFkAvOYjdt3YkhHlem25enfg8/GybS0RBhETDDodSmxU3mpTBKCWSrL6G+S044XBZ3mQNk0IfdJ18Skgv0zZZH7bJu7LpXLGQEMNoIHXT+5oxf5E64DREZabPJdb9qoIbrqpVE34BW7uwCPwRvO2qN1bChD2qMt9baqUsNI+1KxRqNS3nBvvQrt6xTRxx6rFueJuYALFJGNwyqrFHzZXoVeAKawgDIrooj7s7bxWPqPmHacW46Y69jVFxBBkpL4rRtfHPwFLrt445oE74h4DBTqUIKCwlV3oL7fDJctarmJg7nOom4uA9/JhvMrG1u9nqvUbsNIpvOlVzLyqADzLvbVhKSipNZD/ank6RKptOVTj2WJHcQffMSl1kb+UHk8z5vBYE1sx+wZexkUnPsoUPGejzLjgqvEm2hM8Km82b5U8jIMfhad08pcyfbzqN5A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kdaTFobzfzf2DFObTS7tuBTgDWJt9Jhb2leseSkxZXGQaTnJH8MrWYRCR0bZw7lW/+JsNSKqOyzygQVzRhpG3ubFzw9y+1PdOS8I9nlRaUJq/5Q+2xJ+BJ7ASjA8LJd06ve3pq9Z0iEXpAcWoVvpXW558MCzwnN50bM5hlZSWlpO7eacr/ylC072/Nx8wZ/HR/1NRVGZ1W1xmylxPL4f0hVnX1tFF7Rc4AgcOkit2a7O8eOMZ88HW3ie7kaXlvKYYCdfpLEyMt05eAG7eD3gVtyQzLb3/7gOuBvB+z1Ny8vRKXdfBWn6s140tZ+B/PO39DXxDNi//gqQdSF4pvBmqxZFh8evL7W/I6+qd7bVxuMyCAa7fVYT2+Pf+WoIWtibB8BmTHn5t2sEC1mjroCUYtzAwxeQoEcYUj2g4Yo9WSUHlMNt2TuEX46lW+jEeb8ctuwE8Lq3BDhvXl75dPb3VqGMOIHxIKgZeXlYKoRxAOp2JIoUPltJ/QK3qrxSCzD5LQE9d1/UWENClYQzFq39KaLBlE2TumV6ndvhnIROXHW8bb/0ycfY1jjY1wtNKHI/v70Uad0Ht+SsY5s1DIptS6vDdsDM6PDMGFph/xLflI1RcY+SFfoUSoICp756aJrsIJIES2BMFfmxMIv99l3GxNbkmqf+/qQQuN3VJiUsaocGpypKVEKfPO0ZooQcGLQuIPvbsQakVwmAnemYB70Xov8Rcdpg8u+0hAlMQilz1IO5SLIlGccB8uSudPz3xURYAz+0y3yqHDV/86P48WnPIMPr8RdDoyGlN6V2/4hklnE4cEJoQaYRa6pWFVlFhSa1xbSR7//f6gF1NTkKJNYkM+0ieKHvo9b8u4RrXdbhhWNUSzEVEWnRXkStRP8aWI0X3yksjkYz6F76lzH+MbR+0+6BdzLpf7ieANrKV2s90T2R5oHoUsRNZvuI9xd/tYOUGFLdMu3W2Oytu66PNux+Z3mEuCAehreS3O8+yds3TlHeLArpr6X05F+RudRoEg/Vb37lPxl+E0zogjgSf8lTL1JerHkVXofdBjQUGz0u5s1BIlb2ZxwWfdjQr4qLKHce4OFpuUfiHRSmiPoe+QczGKc7MKJX0t/t8qzxHaIPa6b/vxIKFVrJ/OWeaZfR+QRPdWVGUNWawHlit/KPY/keCckoHC1TMJEGoH1DYbV3E8SuSaNLW9bfD8wI5aqXU2C2cwos5QVs2+gWiTjMOnCqURX2ihcEHrjOM6WOGnEu7A1cT3mXQR/qbqQB63OUR8Oja2smTNv3r40XGCNQy0VQbqs1xhSk7b0Oj4IF6OnHevU= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2456452d-212c-42c3-7036-08da5dd16f19 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2022 15:25:32.2426 (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: PAXPR01MB8566 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/apngenc: Add const where possible 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: +6o8AE6U3yVd Signed-off-by: Andreas Rheinhardt --- libavformat/apngenc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index c219b80161..cddb148d50 100644 --- a/libavformat/apngenc.c +++ b/libavformat/apngenc.c @@ -48,7 +48,8 @@ typedef struct APNGMuxContext { int extra_data_size; } APNGMuxContext; -static uint8_t *apng_find_chunk(uint32_t tag, uint8_t *buf, size_t length) +static const uint8_t *apng_find_chunk(uint32_t tag, const uint8_t *buf, + size_t length) { size_t b; for (b = 0; AV_RB32(buf + b) + 12ULL <= length - b; b += AV_RB32(buf + b) + 12ULL) @@ -134,15 +135,15 @@ static int flush_packet(AVFormatContext *format_context, AVPacket *packet) } if (apng->frame_number == 0 && !packet) { - uint8_t *existing_acTL_chunk; - uint8_t *existing_fcTL_chunk; + const uint8_t *existing_acTL_chunk; + const uint8_t *existing_fcTL_chunk; av_log(format_context, AV_LOG_INFO, "Only a single frame so saving as a normal PNG.\n"); // Write normal PNG headers without acTL chunk existing_acTL_chunk = apng_find_chunk(MKBETAG('a', 'c', 'T', 'L'), apng->extra_data, apng->extra_data_size); if (existing_acTL_chunk) { - uint8_t *chunk_after_acTL = existing_acTL_chunk + AV_RB32(existing_acTL_chunk) + 12; + const uint8_t *chunk_after_acTL = existing_acTL_chunk + AV_RB32(existing_acTL_chunk) + 12; avio_write(io_context, apng->extra_data, existing_acTL_chunk - apng->extra_data); avio_write(io_context, chunk_after_acTL, apng->extra_data + apng->extra_data_size - chunk_after_acTL); } else { @@ -152,7 +153,7 @@ static int flush_packet(AVFormatContext *format_context, AVPacket *packet) // Write frame data without fcTL chunk existing_fcTL_chunk = apng_find_chunk(MKBETAG('f', 'c', 'T', 'L'), apng->prev_packet->data, apng->prev_packet->size); if (existing_fcTL_chunk) { - uint8_t *chunk_after_fcTL = existing_fcTL_chunk + AV_RB32(existing_fcTL_chunk) + 12; + const uint8_t *chunk_after_fcTL = existing_fcTL_chunk + AV_RB32(existing_fcTL_chunk) + 12; avio_write(io_context, apng->prev_packet->data, existing_fcTL_chunk - apng->prev_packet->data); avio_write(io_context, chunk_after_fcTL, apng->prev_packet->data + apng->prev_packet->size - chunk_after_fcTL); } else { @@ -160,10 +161,10 @@ static int flush_packet(AVFormatContext *format_context, AVPacket *packet) } } else { const uint8_t *data, *data_end; - uint8_t *existing_fcTL_chunk; + const uint8_t *existing_fcTL_chunk; if (apng->frame_number == 0) { - uint8_t *existing_acTL_chunk; + const uint8_t *existing_acTL_chunk; // Write normal PNG headers avio_write(io_context, apng->extra_data, apng->extra_data_size);