From patchwork Mon Jul 4 19:14:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36660 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp3012341pzh; Mon, 4 Jul 2022 12:14:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s1R6d76FL4DFLxDjtxzziMioTbwfot6kQxjKRhGTzPwR9gsa/yHXO1+tmqJumD4VwVY1Zo X-Received: by 2002:a05:6402:40d2:b0:438:3203:cadd with SMTP id z18-20020a05640240d200b004383203caddmr36136223edb.95.1656962087657; Mon, 04 Jul 2022 12:14:47 -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 f18-20020a056402069200b0043a2601173csi6136860edy.50.2022.07.04.12.14.46; Mon, 04 Jul 2022 12:14:47 -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=RXuLyak3; 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 1B3E468B8A2; Mon, 4 Jul 2022 22:14:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074105.outbound.protection.outlook.com [40.92.74.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E12B68B812 for ; Mon, 4 Jul 2022 22:14:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XvzsmPxls86rirblo4DEI3g5WCKI+WDtJ++13UvBI4KtBRb3n1NMCrHyWl3m2NYDZh1lbouse6NNxZwUN3r1gcp5GNRRs4uP54WfX1p1VmpzGIVBYVxcgBYiXlpwhxCybox2gbNPQrSBHYDEWctRoyoACl5mAA9aBQ4jK9zOMXOKZLppd6NNldrdfk8HcBZWji9V1mACfuEeeuMYmnmkrd3csz3KNf+Eqv+JNI6VWWLmUU/y1b2vQQ3CLGDsygY79bLrLtGJmQ2irdAvWUQV6cPWX/dtiQmY2o9V6VdreF1wq6qjGBstMgINVFUZQrc2C76XZ/ekJDPQV+uaH+Xxkg== 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=N1CBPRKRxj53614QFg66CVQO+jMNPQhEYfnBxtcwdS0=; b=MxgOlmtInsTHfNabpzngcPXxWBrHKFuY8YqaqB9T/YItB5CsX24AoqFG20pvrtmoXlG0/IehNwt6arXxJpkJ8qujhWWRwy6mI+BUf1CrM3EsoAW2c/r0z2avwNGP6G9zdP3CsD9YXgx4PTOjnS9cx3TEmpxQHZyrjsRtoyXs3CwYyHsxeM6vAGJueilGIIJAD7r6rSxlcURIuRx7SC0nmKhWvYAAhBsBJ/B7P2P784JQz+6OIudUkoY4vcXUwccVu6b+tdeyadbH+5NUNGXypQMTGfdvRzDbGMb49d8TI7FwgYDt+IKNSaWM1Xucwu9hnn6uDKgcNabINwMVR3Xh0w== 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=N1CBPRKRxj53614QFg66CVQO+jMNPQhEYfnBxtcwdS0=; b=RXuLyak3p0Z8WQAY5+yKMNu3fwcjI6jt+y/q+NP9wxaW0RGgWwQAJLJocxfT+HfUCo5NiYl+CMYtjhuMaDVRScd/DNf/mQyJp1XHI6JDRfBRrPXbyz32V6vjRIS4p5YYFO2fOWht8BNH3FzIrrrQ/SDM0x5+1tL/H36VW+WvNTNYPUei2TMmXUCq945BXECBI3pYENAGje/6l8YzCg1Hz3ewZbz06KDGb+zMBOSPo1Ieuprglv7fjBR8ygFLPcNHWKjOKg3wpoNPVjpPWFepYqFTc6BXiO9HyK+2Zm3xXCaeDaAj0rSumMDaqSq47vRAGnr8BvRu+t05LBAcILnE5g== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB9PR01MB10050.eurprd01.prod.exchangelabs.com (2603:10a6:10:309::6) 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 19:14:33 +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 19:14:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jul 2022 21:14:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [0c/E27Q6q/xMPLf09nUmxDSo1rt5NZt5] X-ClientProxiedBy: FR0P281CA0091.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::11) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220704191425.1318424-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dc18902c-f1f8-401d-a98e-08da5df16cec X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSUs0MpKjnPJFzDKox26V7nJtUN7ZDgDwtxU8yLMLfSBp+IeB0bsViJ1kBBSyg8YRA/LkZZf8I39rqg0rtbriYFGlbR+dp2gRSwWmh7gG6DJoc/mQDSsc7mBS1l7KdzpJbYHhJu3GH4Y/JOVqcAXTAmVilpetfcyXVDGzjzk21NYoGrxgfSkq4HF+R+FGE25VC1G5ytFgvh7QW0zJgojVTmeHqSdR3gTno4S+mq6VXXV1XUM4olPC8giUEJ7ImtTE0vkqrf+Zll531RBHknXoqbyJ8+MmTXDl5CdliOzCIf2S6qMZO3+Uc7aQXlveLp5F1zyVFzSGLWEcY41U/WVq1tx0JG7I4buqLfUr2fVa2uFRpj3FQ6ioyLcMHmuiuiI/h7kGEF/sLDckqoHTXLFtUbKIQESQov0nyWICMYLRCxUNDUwMp/PlNQtrUnvuXTatRJn+ZJkOUeWZ/K2oo/x4Vm6lTbh86gKQp3O0/9Brnm2Vihnn2SvuRHjflCRgxlSGIMhWHWXt0QPBJAokyhN1u0m2FEi1fzy50or+Ew8kFUmI/SmEmj9yDXNMX2vHGFQ2YINhLAIyZolES80jCk9ScuRmrrm1twAJaYaq3is+0eGEeKTHwTABGGuwQCYSHfu27wlwmujmRpL/20DdHdQlfzgEwo4m8Zyg+ez7TeuRbnE5jI1CTPvSyrLtXk1w49QhTi4RkXo5sxq1KP4RQEHv8VSduwJXvHa+3OZbqZZWHANayVrs4njwzNm6lucCnY1iE= X-MS-TrafficTypeDiagnostic: DB9PR01MB10050:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wkM92Z0b8kSpLlfxetxHoZGZrDztJr1eXGdhNHC+Dcs/A6IrVP4M1VExKIKN5pZ1m8rvu+QxzHyv+rKkiiAf6ORLLMcS0K5iLDUr1w+5tMWDgXOgczErb14T6v8mKmc5mk2QUpaGXiTvqXhJNRcvUKEvML0XWxFpP7uh1jC6Dz5r+/qwETUdYEdTQvs+LI0Zp3Fbpvm9DzacppoeL7t58Qy7HJn/Wfx249hTO9NDjVu1rY/1dhttDDpFh0AOYLYQaKnTrqyTIkd+psOFe8Voq8ki0VS/knN+5lGDKICM8HLcARG37npy0F0Ja4b90/ERAqW0RtPOM/KLCJiboI5bjvpRCXB+cRikQJbnmrLp0Qd2hDytiqU08CaNjhjH7m9V7yKtn8nBCrRB+rp1fGZdty1z+iLC8cOs52ngwdiFmGm9mKLywGtN3vbYh5Ku/C0BSJJrt0xB8PSxaui6j+8tK8y+z3uZEElpWDl/dX9QVODsH/KontAmjqA5+WBcRiEK3DpwWjdWx6iKgGluocOsyT8rrhgkdMbB3gGey+UpzOHfAi8NLmy798P0dnCTXD2UfyXlpoYkZeR2k2zlK1o0ZIBobXTw/1WyVm+D1r/hdYdD651KZctovIgoLE2Ix2gyhuKSjQPGN0ILNkkuoWSosg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dsjRV5/mVrNdH2gcau0dLu8Xay7vUKJRNdRXbMTQJswRmJOzkf7coy9Lv/9y8CPkXYZToCz4bC/iCeYklvI2qjKghW/i5sCKDhfk0RAuMCTQnzqavVa7s2UhgRrGAH9QtGYQHsJIuPUW55NbkiXdl5GBMWIab7RvtGwstx1F78gkctvMxkzRfft/HSCy59HtyQErVaSHsqikJNBC3gRHhvdvl3AXX1y2WpPjHS+zkGzHRZlR0PJeHg2g2pzdk568hRvKYSBqaeVC/FmsnGOgXCA5oUZ4S3XTfeS5SI6Xrodm6RTOgC1JakOVgFVVWe445gPym02wbN9flzWQLVyPa6feyN4gM+SvS08TocXhzgWPEBaZCtqY2/yrgROl0WRJnskXYf8Xvxsebpb6rrhPVl2nk3Yb7A9gSwZaUjHCmisSwweqIDOkmdYKWKR+LktgH6vUdRbILc0jln1ExR4T/c0D61dqWflM/8gwecLe7Wepo9bZfBbz5GDlGfW9T92meX55Uiyx42jqMLrQ64qxRqmotI+h685J9gVR4Y+tpSECWGdr3vA5VatEQPHzefLG4bH54xxkpKRHnuZv8Q1khlEneJJswNoefh4kqsfhU0sQhVbjhWeC1tPzDgyEXhq35SAzyMKwRk2KndEH9zilb0MsIIDaq/QRq6NvnHUSC1A+eij7LwdsYGuCyT6Qhf6C5G+ZPEnYO3lco3epkMgjyFCMmWfD57F8v5h9LfUW3IdJZGYo4JLzvoxS2ZBykp9mEHCs0LVHpskM2gr6C8P6go/L+e1Y+l3IXVjbGj0w5Pzi/3eEmPUH0z39uEGZprdIouqcZaWCt46C9KWqADaT8Dc3IWydwAauqayGJnYlu7TOrUlRYYuDxmrDdioNxwhK7ldZ3y2I4vi7mHMW+DxP8yniseT8NjbXndDI+8PKQKRmUl6sm92gKpBTB35dEREMtT4RaLqqbvG79sP5IiFvMU4B+C5q0bzof/D4OQ4iClhO25+tUiQRrCA7Z/KWIxApwcfhabQsZmx5eWdCRLDBmFm8sLBRVB+2UGRfbqbqSNVN5LqHrtSD1SwMEZauGLJBfyCcDJi7Q1CCqmEACQslG1GCav66yr0Nc0DqXcHqS8HMNLd3Qh041wDDSWHIa8UzmhZPTLv3KU5Vu3SKB0zBzaHmLFxQ9QXKzZ8+CJ5V57XXfUPUdlOHAAxSKzuesMExLFRIp8IESdJSE3OV/9lnppTPwSzRRLn5Eyfgx+Qk7kV/mAkBJPeNlU9q5Fc96OnPwtEAIf6OSj8PHXSFuLrqaK6S9unHhTLsC35EWqZw/Lg= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc18902c-f1f8-401d-a98e-08da5df16cec X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2022 19:14:32.6400 (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: DB9PR01MB10050 Subject: [FFmpeg-devel] [PATCH 1/4] av(format|device): Add const to muxer packet data pointers 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: WfWY5kqReCN6 The packets given to muxers need not be writable, so it is best to access them via const uint8_t*. Signed-off-by: Andreas Rheinhardt --- libavdevice/alsa_enc.c | 2 +- libavdevice/fbdev_enc.c | 3 ++- libavdevice/oss_enc.c | 2 +- libavdevice/sndio_enc.c | 2 +- libavformat/dvenc.c | 2 +- libavformat/gif.c | 2 +- libavformat/movenc.h | 2 +- libavformat/movenchint.c | 2 +- libavformat/mxfenc.c | 2 +- libavformat/oggenc.c | 4 ++-- libavformat/spdifenc.c | 4 ++-- libavformat/swfenc.c | 4 ++-- 12 files changed, 16 insertions(+), 15 deletions(-) diff --git a/libavdevice/alsa_enc.c b/libavdevice/alsa_enc.c index 3d6bccdc2a..ac09e33c49 100644 --- a/libavdevice/alsa_enc.c +++ b/libavdevice/alsa_enc.c @@ -86,7 +86,7 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt) AlsaData *s = s1->priv_data; int res; int size = pkt->size; - uint8_t *buf = pkt->data; + const uint8_t *buf = pkt->data; size /= s->frame_size; if (pkt->dts != AV_NOPTS_VALUE) diff --git a/libavdevice/fbdev_enc.c b/libavdevice/fbdev_enc.c index 898a630aa1..84ec6733ff 100644 --- a/libavdevice/fbdev_enc.c +++ b/libavdevice/fbdev_enc.c @@ -100,7 +100,8 @@ static av_cold int fbdev_write_header(AVFormatContext *h) static int fbdev_write_packet(AVFormatContext *h, AVPacket *pkt) { FBDevContext *fbdev = h->priv_data; - uint8_t *pin, *pout; + const uint8_t *pin; + uint8_t *pout; enum AVPixelFormat fb_pix_fmt; int disp_height; int bytes_to_copy; diff --git a/libavdevice/oss_enc.c b/libavdevice/oss_enc.c index d6a512a264..704f434c53 100644 --- a/libavdevice/oss_enc.c +++ b/libavdevice/oss_enc.c @@ -55,9 +55,9 @@ static int audio_write_header(AVFormatContext *s1) static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt) { OSSAudioData *s = s1->priv_data; + const uint8_t *buf = pkt->data; int len, ret; int size= pkt->size; - uint8_t *buf= pkt->data; while (size > 0) { len = FFMIN(OSS_AUDIO_BLOCK_SIZE - s->buffer_ptr, size); diff --git a/libavdevice/sndio_enc.c b/libavdevice/sndio_enc.c index a595438d8a..0cf58fdc6a 100644 --- a/libavdevice/sndio_enc.c +++ b/libavdevice/sndio_enc.c @@ -46,7 +46,7 @@ static av_cold int audio_write_header(AVFormatContext *s1) static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt) { SndioData *s = s1->priv_data; - uint8_t *buf= pkt->data; + const uint8_t *buf = pkt->data; int size = pkt->size; int len, ret; diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 1917c00694..7ef9692302 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -245,7 +245,7 @@ static void dv_inject_metadata(DVMuxContext *c, uint8_t* frame) static int dv_assemble_frame(AVFormatContext *s, DVMuxContext *c, AVStream* st, - uint8_t* data, int data_size, uint8_t** frame) + const uint8_t *data, int data_size, uint8_t **frame) { int i, reqasize; diff --git a/libavformat/gif.c b/libavformat/gif.c index cba87d3eae..b52ff4dd39 100644 --- a/libavformat/gif.c +++ b/libavformat/gif.c @@ -54,7 +54,7 @@ static int gif_write_header(AVFormatContext *s) return 0; } -static int gif_parse_packet(AVFormatContext *s, uint8_t *data, int size) +static int gif_parse_packet(AVFormatContext *s, const uint8_t *data, int size) { GetByteContext gb; int x; diff --git a/libavformat/movenc.h b/libavformat/movenc.h index e4550f7900..c6b3313deb 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -62,7 +62,7 @@ typedef struct MOVIentry { } MOVIentry; typedef struct HintSample { - uint8_t *data; + const uint8_t *data; int size; int sample_number; int offset; diff --git a/libavformat/movenchint.c b/libavformat/movenchint.c index aaaaa3ac7b..0169341189 100644 --- a/libavformat/movenchint.c +++ b/libavformat/movenchint.c @@ -96,7 +96,7 @@ static void sample_queue_free(HintSampleQueue *queue) * not copied. sample_queue_retain should be called before pkt->data * is reused/freed. */ -static void sample_queue_push(HintSampleQueue *queue, uint8_t *data, int size, +static void sample_queue_push(HintSampleQueue *queue, const uint8_t *data, int size, int sample) { /* No need to keep track of smaller samples, since describing them diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 2d08dd6d40..9a9acbfa08 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2139,7 +2139,7 @@ static int mxf_parse_dv_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt) { MXFContext *mxf = s->priv_data; MXFStreamContext *sc = st->priv_data; - uint8_t *vs_pack, *vsc_pack; + const uint8_t *vs_pack, *vsc_pack; int apt, ul_index, stype, pal; if (mxf->header_written) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 016047f616..ae0705ba54 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -197,13 +197,13 @@ static int ogg_buffer_page(AVFormatContext *s, OGGStreamContext *oggstream) } static int ogg_buffer_data(AVFormatContext *s, AVStream *st, - uint8_t *data, unsigned size, int64_t granule, + const uint8_t *data, unsigned size, int64_t granule, int header) { OGGStreamContext *oggstream = st->priv_data; OGGContext *ogg = s->priv_data; int total_segments = size / 255 + 1; - uint8_t *p = data; + const uint8_t *p = data; int i, segments, len, flush = 0; // Handles VFR by flushing page because this frame needs to have a timestamp diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index 0a634e4232..7b8e231cff 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -63,7 +63,7 @@ typedef struct IEC61937Context { uint8_t *buffer; ///< allocated buffer, used for swap bytes int buffer_size; ///< size of allocated buffer - uint8_t *out_buf; ///< pointer to the outgoing data before byte-swapping + const uint8_t *out_buf; ///< pointer to the outgoing data before byte-swapping int out_bytes; ///< amount of outgoing bytes int use_preamble; ///< preamble enabled (disabled for exactly pre-padded DTS) @@ -657,7 +657,7 @@ static int spdif_write_packet(struct AVFormatContext *s, AVPacket *pkt) av_fast_malloc(&ctx->buffer, &ctx->buffer_size, ctx->out_bytes + AV_INPUT_BUFFER_PADDING_SIZE); if (!ctx->buffer) return AVERROR(ENOMEM); - ff_spdif_bswap_buf16((uint16_t *)ctx->buffer, (uint16_t *)ctx->out_buf, ctx->out_bytes >> 1); + ff_spdif_bswap_buf16((uint16_t *)ctx->buffer, (const uint16_t *)ctx->out_buf, ctx->out_bytes >> 1); avio_write(s->pb, ctx->buffer, ctx->out_bytes & ~1); } diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 2c8c034c42..75b892087f 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -481,8 +481,8 @@ static int swf_write_video(AVFormatContext *s, return 0; } -static int swf_write_audio(AVFormatContext *s, - AVCodecParameters *par, uint8_t *buf, int size) +static int swf_write_audio(AVFormatContext *s, AVCodecParameters *par, + const uint8_t *buf, int size) { SWFEncContext *swf = s->priv_data;