From patchwork Mon Jul 4 15:24:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36653 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2900284pzh; Mon, 4 Jul 2022 08:24:57 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uXWde8J7ciaZiy2Vkl9HJLV6GluFrMkFZVXuxjB+sQB2chYrCQBfDlqngy5a5G2pt0FyVc X-Received: by 2002:a17:906:53ca:b0:6fe:ae32:e01e with SMTP id p10-20020a17090653ca00b006feae32e01emr28326327ejo.455.1656948296934; Mon, 04 Jul 2022 08:24:56 -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 gt17-20020a1709072d9100b007263ea0d796si9647458ejc.238.2022.07.04.08.24.56; Mon, 04 Jul 2022 08:24:56 -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=NHRYEPru; 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 9F9D468B909; Mon, 4 Jul 2022 18:24:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (unknown [40.92.74.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0BE468B85D for ; Mon, 4 Jul 2022 18:24:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N+p0jleFHT/8ZxmcI83zyg0ybL6SnC+E8GIZcqRW1FMR3DQzKfX1uxWU+C1+rfJuyRWZEkDYLz+LIQfbFup+6Lh464lqZESB8rWYzjXZB0Y2fDtcaZixBesCQlqhVBlMgpKqiaVRFYZUeC3fa0QFD1iOQY1GnROgihQkW0+Aa/VLfbd6E+VMYgec2np7HZTR1rji4Rega+sZ3fy0z3usuiaePQbDPFMa4h2Er26abqQai5ZvycXLP+zyyQTLelygu/5+fJ8pQjknQpudy04N/tafZNQ4Im4TXnpqvuQ+MLTuiqe2WWuwDZStSg7fafOnISmE2h8u/JO6kOTGjslEsg== 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=DaNcugLT9RN6WavhNvNTBFIbdIoiDhHFg8PUBLS2NBI=; b=fy7QdUtNv4+2MUYPdbGPkarBi2pKdxsLzWdBvU7hBwHGcHn9ZduiYM5dosyzl4rSxt4rEusVYuRJQtbCzn+sT/SwuC2XxTdLnno8xA0DWSFUhTFLi+5oCfQ3F0PmplDKe8zVJcF1sHYm7kG/moIoYby/A4e0FUr4kgrCc6jQWpp8V+ewc1pxkW+kiEADvNtn6iVHcNEFy/aGsZSxlDFpMuRqtbsML3SVu2oeneMRhiiWY96lNKss91T7OTlA2IZXshyYyfOag4bWZ6U50qLWifi/OjEzGVtcfHCfWb6GSJoKRTKFDGgkZPTirO7fZv7RI2CSMnMBYxwXkaO5KigZ7Q== 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=DaNcugLT9RN6WavhNvNTBFIbdIoiDhHFg8PUBLS2NBI=; b=NHRYEPru69cYv4DLybG2vIh5FYB2DpmwmWCni48DB3/ubEknA+n92RO4tVzie7tPgsyvlVROC/wcB3k7X4M8DHE7Rc6Gmhy7aAAGaSJWaVqEAwwa+Srg+PLt3yWAbTD4Ue3llbgeK9DpwbYl3scigEI7L0jDlOnqAKMBsLLLFCQG198fuIxj1jgv07t3tAmxFzFkSiz+Pkge/72mVZvfUB4TEOZFa8aa7dDgL0YneudmtRZCkh/QSReHGUBQPIXugirBWcDbagjLEO9m7wTr3/cns9RBw7lUFgzx/j3i6YaK/q8ROEXYMnKP42WHOwpl8UQcNvUGGlg+fs5WEjr8HQ== 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:24:44 +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:24:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jul 2022 17:24:32 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [sZGh/COq+oD2Sdf+hD9QyqcYcNWxhq8m] X-ClientProxiedBy: AM6PR04CA0006.eurprd04.prod.outlook.com (2603:10a6:20b:92::19) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220704152436.1106604-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e2069f32-c92f-49c5-ba55-08da5dd1528a X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEvDnTigkO2HP70aBMK1Ta/wlUpGyBg3Zgm23c7DEePGsSBzb7NkiowOhu/w38fO51dkEhwohnm0GbumwC6Bt0G6XzSydRG+t8G8gwjJ5FjQTsUzTkseS1oMIL1fGr12I5HISa+9DN/cUV0clhdIvW9smfNUX2p9lzQSDFmBVGrtLoabPjju6wWrUp+wfahnpmRoUtMu26sq4/1E6njwDoD3b59TAVjbRRPOH56s8rCFv17Bu4Vtww4oaG6uAMzrgwG3/8CIjuns/zTo24+jfw22+tZ4UUR5s8A3FL/UwKoliFT+OpvG0YL4HHyzL2lGy+wfp+dlu57aZKC3tICZOB1sSJyxm8pTp5/7Y/wWKoUUnkvIniXBu41qoajR/1aCpFKTGvvEXsPYEgSQuDVymls2SnUbGgbR349QHRh0rWI0V7JtXhKk0PSB521E79Jo5xnlwXFL/5luRiSXQacUvCCZhMXZdqkdIUeJpUqMH8Znx2X8qcr33hVVC9J3MwiwJwZJ3yqPFm9/gEBxb0wmrZi2eKS7YSj7Qmswicq4Q0c553kEcZy9PaHJs3qi3KDG7JhxKjMqvFqJzkmX+M3yBufT4zPu8JdYGvdjclDFMenEhDymKklR7Vi+H5EWS7MgCqf1BZ0O1NosFU6nYCt3826gGCqswPxPR8UCnaw+/tfdoMgr16YfPpvg9sXLgUv/XK5rpSDlXJsnZiiQS5uiLNO4PJvNnQkPRaH+CCJDv6PBuEJjREaYHcvP67Nacrb6ADPEIl+BaqszPtWPfJFIKF8J X-MS-TrafficTypeDiagnostic: PAXPR01MB8566:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NWq9Tzdof/D7Ldtnh/XZdeauA2zMxcnLBo02DCMPpxhHNr7d0kxJdsx0qR5eHKrzvNasDdYCThmNWTuucJBq3VyglfEITRaB1zg4Z1WjK6Wa01KNpsgQdjn68li25KEDVu6YcVechC/Y1YN10bBk4gQZ9YtrzqWH8Md39x0WZY77ucNnd+4x9JEbaieANwCtUAfYeHIheFeKG4lJ08vaq9mSyjICZi0/yhCYMrJktn+wa47nVI3yvT2LrZye/jPA/LfGakn4ftKlMFaXMIxenzI+rWEaWP0Nwnlh87Ay1y7qexdqwUmn/j3n6PRuegBHOaLom+UnjJIPPXM3B6sKF6mq74i+VQG9Z8vp72m36tdQtGTr/nkItLPc46nH423J1cgGvzXLLZ9NhHp2IckCz/OARqycJHa+CozzSG4YaZB6j79qbcTLfcGG8X+xP7qhIbJzVHijY2HBANeOZM+BrZT7nsVvHILnZfjb/gQ+mxK1xFt7SECi5ssTaOh8rO9eqSp3qKPdofqzUrpoFzmiSXVGQL/iAi/PMZoq9JKc6Xb07y3CzjWMBASkhStnO1UAFeglfBqJnWasirCXCGzC+a+efBRVx2fCQON/SyhZSkk2qJDy8jgsVs/fDN75pb32a0A2Xxvn8ZnfYuQwYs61aQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Yzgv0yVzpDH3cFHhseneY11YWq4Qb7JiHGyBZuEtgRc48TOpSUcRNwxJ3KXo2WkvtfyxQbuR3GWsAkZzRqhBrB9UTWEGoyIy7D+PfSTrYuBi9lZ4RNQKbuNm9QCDx2DvO++PW5B/PfLMICO6VxgYdJdjpXJgxEngrWd+n/+OgLCjPrf5BcIt0vQ2mzkPzvLDUwvl28qyWuNiito4rgYVJBKuMJuDUQavIgFxXMSG9vkjGdF8r/LnfAZG7trx3bRFYEe1/Mx2/HEzWGdTL4jAHLSsMs18LLuBXbPvoek7qsk5tBqBYJ9dT3K1bEe4kDM5LObyC1I0QWcCL6m7BOAl4nQK7IcVCzj7aFE9hcybdxNxlG3SyErxrVlP9CCwfcPD8DG83Xz1Lg+hclnbYBf6omCmjcOB2x7x2Mpq6V0fDp4aVe32SB7td3Php2qJNVaeYuDKqzwn5LgrtuYpvKFhoykrn0vm9zXVkdnVpSuRC5W3Z35WJmtS0WQdRD1nm1X3kXmmiO697XdcxPYzixR9+VU5RaWOYGWSiRBzHJ+uDNbPFsSozOfp9e/uszXsJ1+zS0EnKk6JsSD39+gT25EMzTk1cqebObxrnCfrtg62VMsc3DP8hrPkNJy3WMjtTXNY7eADtHmLeQm4nrFfoxNLdMnKcf9BEoknOkvSpJkDva6+iJyFPVg5hJbW1vrwVpM6F6+zVGpGPN7zZ1+DOJx9B0Zv0UdHV08h2DGXuNpVNF7VJC+7uYLIhFdsIMJcUHF2+h5QjAqZvR8F2BaDi7c4IfbMSS3QeAskMv3yaqhLyvtA3CP87dhjmLHGhTESmX4RCGdKOxaLcmxEh+/XY/Tmw6DKcrjYd7Ce5w0fA+p+3HvXXMdxy+Arl1+mqn4wglRd2Tw7ySBQqjdkcSeAaHR2HHDbXZhV/1882xAsXG2EHpK/9foE/lrF33TDnsn5M11NXvTlLdA9joBdkMMflv1lZVrtCPFvltq6xRF4hSj5xogDsypcb1cji2TQiLsYEnOt/gAwlPSbw0+keczmS7pZch0H1IfD39XKe5XeBRcdGMKAohXXRV0+n3rqLWGEUAq04VqgMMtLA5tvcWEhFMuTCtCXPPfzqA60GueB6Wm2tSf3O1f/vx3yOOwSuhv1Bl7VZe0VoWskXb6V4w09pX9smE7K57dXE8EnDlGylwSk/wqEuRGBLcb4LWBfnQJL/vxVKAdNh0++Rc0VoLH7ThDEOr3R+q6lC+/OVeeMC3g3IVMvg3Rrsk+Lq/xNFjra6upkKI2xG5GfizPeKEfk6CUSkXrvMg+fJjRF/DvDJ+Zv8WY= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2069f32-c92f-49c5-ba55-08da5dd1528a 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:24:44.4551 (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 1/5] avcodec/apng: Add APNG_FCTL_CHUNK_SIZE define 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: dyPpOu8y0umv Also use it where appropriate. Signed-off-by: Andreas Rheinhardt --- libavcodec/apng.h | 3 +++ libavcodec/pngdec.c | 2 +- libavcodec/pngenc.c | 6 +++--- libavformat/apngdec.c | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libavcodec/apng.h b/libavcodec/apng.h index 41249e0df0..abd8795334 100644 --- a/libavcodec/apng.h +++ b/libavcodec/apng.h @@ -38,4 +38,7 @@ enum { APNG_BLEND_OP_OVER = 1, }; +/* Only the payload data, not including length, fourcc and CRC-32. */ +#define APNG_FCTL_CHUNK_SIZE 26 + #endif /* AVCODEC_APNG_H */ diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 6b44af59f2..87b0c639e3 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -972,7 +972,7 @@ static int decode_fctl_chunk(AVCodecContext *avctx, PNGDecContext *s, uint32_t sequence_number; int cur_w, cur_h, x_offset, y_offset, dispose_op, blend_op; - if (bytestream2_get_bytes_left(gb) != 26) + if (bytestream2_get_bytes_left(gb) != APNG_FCTL_CHUNK_SIZE) return AVERROR_INVALIDDATA; if (!(s->hdr_state & PNG_IHDR)) { diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index d79b4e3895..93463dd341 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -988,7 +988,7 @@ static int encode_apng(AVCodecContext *avctx, AVPacket *pkt, // to have the image data write to the correct place in the buffer fctl_chunk.sequence_number = s->sequence_number; ++s->sequence_number; - s->bytestream += 26 + 12; + s->bytestream += APNG_FCTL_CHUNK_SIZE + 12; ret = apng_encode_frame(avctx, pict, &fctl_chunk, &s->last_frame_fctl); if (ret < 0) @@ -1002,7 +1002,7 @@ static int encode_apng(AVCodecContext *avctx, AVPacket *pkt, if (s->last_frame) { uint8_t* last_fctl_chunk_start = pkt->data; - uint8_t buf[26]; + uint8_t buf[APNG_FCTL_CHUNK_SIZE]; if (!s->extra_data_updated) { uint8_t *side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, s->extra_data_size); if (!side_data) @@ -1020,7 +1020,7 @@ static int encode_apng(AVCodecContext *avctx, AVPacket *pkt, AV_WB16(buf + 22, s->last_frame_fctl.delay_den); buf[24] = s->last_frame_fctl.dispose_op; buf[25] = s->last_frame_fctl.blend_op; - png_write_chunk(&last_fctl_chunk_start, MKTAG('f', 'c', 'T', 'L'), buf, 26); + png_write_chunk(&last_fctl_chunk_start, MKTAG('f', 'c', 'T', 'L'), buf, sizeof(buf)); *got_packet = 1; } diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index e84f74e9d0..47cdbfcbfb 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -222,7 +222,7 @@ static int apng_read_header(AVFormatContext *s) ctx->num_frames, ctx->num_play); break; case MKTAG('f', 'c', 'T', 'L'): - if (!acTL_found || len != 26) { + if (!acTL_found || len != APNG_FCTL_CHUNK_SIZE) { return AVERROR_INVALIDDATA; } if ((ret = avio_seek(pb, -8, SEEK_CUR)) < 0) @@ -336,7 +336,7 @@ static int apng_read_packet(AVFormatContext *s, AVPacket *pkt) switch (tag) { case MKTAG('f', 'c', 'T', 'L'): - if (len != 26) + if (len != APNG_FCTL_CHUNK_SIZE) return AVERROR_INVALIDDATA; if ((ret = decode_fctl_chunk(s, ctx, pkt)) < 0)