From patchwork Mon Jul 4 10:58:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36647 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2740485pzh; Mon, 4 Jul 2022 03:58:25 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tCJXrI9Btr8LvbcG2WjCpancY4Sw8Dnk3uC1ioq+E1KIcwItNIvHdb9EGe/hINUtif1zb4 X-Received: by 2002:a05:6402:e83:b0:435:a9bd:8134 with SMTP id h3-20020a0564020e8300b00435a9bd8134mr37208031eda.243.1656932305737; Mon, 04 Jul 2022 03:58:25 -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 dd11-20020a1709069b8b00b00711f161476bsi26503093ejc.789.2022.07.04.03.58.25; Mon, 04 Jul 2022 03:58:25 -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=KQdvxsAv; 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 05F6568B094; Mon, 4 Jul 2022 13:58:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073085.outbound.protection.outlook.com [40.92.73.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF0B568B942 for ; Mon, 4 Jul 2022 13:58:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CKMWWhFrzM2GJVGTsO19vHNS2XGfoj0Yc8LHC9ug5djx3+871wA8u7WNereE4vNgvy4xqt0k6UW5ndPC2DAQCNKhjO+vyVxUIUslSWWkUl+XJqcxtWFEfHUaXj8iqa13mLYlj7m9YZ9YhBErHLxunZclhPYTNaayGwxFPxUDrhj6RDTbh6sHaVMRIt9hcT2RFm8gbJPqtFJbbD9CNVuSzPrkuoWBnASehEIDTdaY+LJPLfyxSmIYHvW2fGIlfVJw8zc3EaWH7afPQpZRmZRLPuFPf5d4elMlMQ2p7hpxqFeNGSd+ZK+elGUH7yLJD1WB+uAk3czFjs+iLE0LH531YA== 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=K3PGj9Am4Q4shd+UlaHzOjjt+VXBYX5M7ebrvvt2gpg=; b=i9T7UdmjCdyzj60Q7uNvpk2bmF0g1YvehfuecNTcyhWkkzSdh/DXoLm1cW4VW2I7II9j/Ye/gEfhhgELpTJtkoj2JanvZGUFKUNF8mN7LthrxO/kyh8y5FvsFlzdnlzFMtGDSQLmSDA2oOStBx0Jc8YTXp8ca5DSjtUJRpXLGyf0u2KpCIjEXB16GNbyg0gdaVKYo73Vc16t9u/rowQFovfhhalXao+afBKmR7a9gFF+7WuHfzzMCUJKh9RPJMV8R7jt3jYK/unvppRyrGCftx7JX8W+PcljwJxxvUQf08mnWjergKQY9DsZLlRkiLJ2ZJcavDQ3D1fnUohLszrH1g== 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=K3PGj9Am4Q4shd+UlaHzOjjt+VXBYX5M7ebrvvt2gpg=; b=KQdvxsAvHWVhCCFT4RHGr/4q2yFYX0AddYsyfpLrVIIuqOM8QwaEnvt1ljY2V4NcktGkCKOk78drMrzUGB+GdAO7loZucyecVLkQAoerN1V6nMOg8dOWLW76nZ8iQR+HKWTRNAlstlcy+Ptg8xzDy6Y3h21wvbazgPGhbF1r2FvpjlT/55iRj8CBsFht4Lmq6dRngEiAfvqItPfHL4n9Pj9OMTc4uRhsShVbLvTfGw3YqoZU/oAkzdfhA2P72dHo8SJlUK8rp2setzs9EjFjHnyOfmhOl6eVhQDxahuzRVzg1VmP52sFWQums6aQnazwxUSfDenD8CM+akqDHGP58Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB7PR01MB4090.eurprd01.prod.exchangelabs.com (2603:10a6:5:2f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.18; Mon, 4 Jul 2022 10:58:13 +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 10:58:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jul 2022 12:58:02 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [Czmgq+NeOcikxdrIUzJXBZCo4SnF12ll] X-ClientProxiedBy: AM6P192CA0078.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::19) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220704105805.811539-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0aeb2e29-4a5f-425d-d588-08da5dac171a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSUs0MpKjnPJGVAIGxoh9EBStAOp9PTRPhyHXGhB6ylgSgmFVVsxcS5zOWXidurfYdcTd/+hUjeneuOXhKdwr7dqergg3I18Li51/hQii3jWzrpQLAJIoPtXr5rPULRtTKhrM2Zap2VT7gYjmtvUEUDihsKlIxVq2CIt0p58P3912Xp1Lo9mrAuahtHeP57KXl4s/nh2ljIlSD4/lx7xeKYDHtlM6Z0EyZWUOKxZ+ohG41wOffY4oqErLmdumtnELG/pABsTxYvqxbwgwa62jipARhtkXzAUPqiS3mtXWysTIfCNNxA4+UPNsqA/xIkAp2r0rO52xDAgGD922OJ93TEDIXvNvLp3A5C5GwwHMEywQUQi88ybZjhwm5Yr+D8Xm9j3QENPwn1lEeH6oxY/rjMu+Rj/cVPfTkWswLkZBqdEGSEHpJOTgmeIBug+wJiljJ765AI76pYdvL4vxbls0A8hns7smPWUx6aKQX6Y71c3+rbhjdVNhIZ4YHKVGWCHck0Htp0DR2L5fhLNUl5UhwiSyKSNpNAIMf45ZGCCFk2JNHlYVlawBHRAZ7Cmk2gMg6YIRODO2Uzb8PrhwxtHAh/v2+nfWJIWcqZD+zf/8FbB/J0E6YRm5ix2ykWZcOQlhD05Lb3UyKlOyvo31dM25HrA1Yj5EJHSm4ICYDzU91WFTyNijaFLPNM0tIKOe3dDtENmFAI4d0YBpN7GmAz7Ljj9N9oR8VkVl7fPEM2jPiBq9LbQWeoNT/6VAObU9xMqpI= X-MS-TrafficTypeDiagnostic: DB7PR01MB4090:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uYIkHMSMrs8TjtDdcEEGuh8O18d9KetPne1HzG/2n2F4UMhutG5wrqlXqSYAiYhiWVYtJnlWoMDMHLRR7LJ9I4tC1R3HmMCfI5vWnddp2cKYyRmFofXOkTE4W6PXkCO7mjkO4GSPQrf9RURe/U+uc+ot0oZZ1lU4vLrFzUnuQN9XyW4qOsdf5xsD/AhK2XPLvA4tEzbY4lQd2ka0Xaq3NxDFbiuozvYgI/kSPOwF7tnbMPlsl9ncdyJ3n9bSuQ+QPkaRrFQo9WmK3+VNDVm+fMPSQk21mMoSfQeZY+VAVaqp1iO+wM9vvIoPj2Hi+uv3TXCUyl3hXZFBwrwfw2aqqOclk08fe0MFBkNP/ttQ5/jJzdyn4UHqFrDT/FpzB/HERY7fFMJIaWsoYQYgevO7bMZNReHuSyhZGU0FZopDDUpigvoIOpd+8CnJfrfz8ttM7ioPi09LBKGXx9Am3XOH/hzd7HYK8g5r0cdn8WLIwbdQQ7ZbI+5nNaVIMAgu6SyJM+e/OOqEI2a1cw2puPA2A0f8ySTN+rZtr6bSBgEiD+seyGefsSvGy+uw2QfyM6shs6C9P5lOC7BDrFfbu3QptenPdvP6ZrB0FMOG67sHGa89m7LFjeFSxFnJfCwJkx7NwYnKhqO31m5ksbOhgwaToA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wpS2SSfkyeeZGIxuXHvhjSJ2TvzVU1cHDLKK/pBFuxipboIifOZBKzTvPqp6apPu19wX4f5U6bLvNeSF7fwdzZuGxrC5jTllW2uIr5KH5yJFdCU3jWV2U2tXhXC0MBdYyWoVA9htcHGfxJ+3Wiw5BUSsMQ5MWEIHx7qZEfnUwtPuKYt0FChg88G4Qsa/wJHUo42GDSy/yKoM6hti6BAT51FSqxPK7mt6/uLd01GEhAtT9+ipKZjaCIb7H+5mAWCCDMQ6xT/dUyMInfpcC/G92tRQX4bxHm7GjZJVkdGAoPb1Ux5+34VDZakP3Jy9Fcg+iR6MQxGWr1spvjMx0j8y1U/WI+dfNmMWF1mtZog5MEDlSC01IE9hFVDHAZb5QM1elL2OwTtCk7Bj6wZOMoDMdNryH1n836Ev6MN9zGnXfgH12b/5dT1ylBsg+Hw7jru1EF8an7NR/izQpKmXJZ+rCx+/RpuQ5aBvkwSTP17PUJgHS7ZUDbrsH9Bkxr3m3vVPwt8Fp5hORy/yRsyP+eQjajwi3EeQ55Dd7Dp9gQJnwXyOxk2cGZQfsjuRQvsvlza+K184fbjAult7vYf3IY/YKL+5UwaNS3J6qDJNGrCOWMAa2g1xkG+oROOyvphkE5/oAEoqjSKoZSuxETvtQpRyxKEKd7kFPA2dsYiclbbSFQ4l7FBtwzBFw4oViHikIyQr2UBzGPa53O87GRucVRBFbR2TjmbbHqvF4zyH99tojbkra8tWtsBecivjUHPbMbLvSxPqWIFOMQzL+U0eSJ9nekHqONqeNlXG9g0/B6SW7lH8pznRxag9SrxXxqqqvLrG2M5y4PxNH+wEX2YXZTxsg/mOzdbPiMi3YR7gnj33bvGo1v9SJfA1vsneAVqz8autOc+9TnCQk2VVi046nfYIZnTq8Em4Sqjl0PZ7Vk8TfncMxVpr0dYMxEjsvOORDnbcTHvnYdQBqd9EVlNgHX0IA9oI22uUkRPxz2lyjc8TLYDuFXk6mAEO+dw5y1E9FUT0KMWdY8XpdnCOi3QoRBNK26wPJkaEJ7/8mK/+ktomsZq8W/Or6tMBG2yAW5f2n319g4jndRnceYMvByGrzefx+f9D1AwCph3Dr7VBllpg6aUBsUB87r1PDNNEWz2BtnVwLOB0N0aPYvveXbgLQuieBMgFa0zGsu5xivMiMetsx18vZv8agmv4VGvriE6SIGGUJRSOwkxPGt5z0ZeTTV43dWAux8GTO9fO4StQvaXCOkzQmBZrh4d+pOWm7GnGnEF7EE4O274mrXiW4PIv2z7TYL8nD7aAD48IRKAPoJ56br0= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0aeb2e29-4a5f-425d-d588-08da5dac171a X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2022 10:58:13.3712 (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: DB7PR01MB4090 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/(mpeg|mpegts|mxf|sup)enc: Use const uint8_t* to access pkt data 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: csv7RMBDC2ZR The packets muxers receive are not guaranteed to be writable, so they must not be modified. Ergo only access the packet's data via a const uint8_t*. Signed-off-by: Andreas Rheinhardt --- libavformat/mpegenc.c | 2 +- libavformat/mpegtsenc.c | 2 +- libavformat/mxfenc.c | 4 ++-- libavformat/supenc.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 62692bfcd1..3ab4bd3f9b 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1145,7 +1145,7 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt) { int stream_index = pkt->stream_index; int size = pkt->size; - uint8_t *buf = pkt->data; + const uint8_t *buf = pkt->data; MpegMuxContext *s = ctx->priv_data; AVStream *st = ctx->streams[stream_index]; StreamInfo *stream = st->priv_data; diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 18e8f7e45f..c964d58c8e 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1836,7 +1836,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) { AVStream *st = s->streams[pkt->stream_index]; int size = pkt->size; - uint8_t *buf = pkt->data; + const uint8_t *buf = pkt->data; uint8_t *data = NULL; MpegTSWrite *ts = s->priv_data; MpegTSWriteStream *ts_st = st->priv_data; diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 7041659143..2d08dd6d40 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2806,8 +2806,8 @@ static void mxf_write_d10_audio_packet(AVFormatContext *s, AVStream *st, AVPacke MXFContext *mxf = s->priv_data; AVIOContext *pb = s->pb; int frame_size = pkt->size / st->codecpar->block_align; - uint8_t *samples = pkt->data; - uint8_t *end = pkt->data + pkt->size; + const uint8_t *samples = pkt->data; + const uint8_t *const end = pkt->data + pkt->size; int i; klv_encode_ber4_length(pb, 4 + frame_size*4*8); diff --git a/libavformat/supenc.c b/libavformat/supenc.c index 1ca19fa161..c45d8a5321 100644 --- a/libavformat/supenc.c +++ b/libavformat/supenc.c @@ -27,7 +27,7 @@ static int sup_write_packet(AVFormatContext *s, AVPacket *pkt) { - uint8_t *data = pkt->data; + const uint8_t *data = pkt->data; size_t size = pkt->size; uint32_t pts = 0, dts = 0;