From patchwork Fri May 24 22:04:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49212 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2018587vqf; Fri, 24 May 2024 15:05:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUSIE9JZbmqNrEdH+J+X9EoveDl1M9DEsoB28xRxFaIgcCdvDzpAbE4sTrJLI/bIbSj5Syn/5DZrmZkXfHTo+QAAifs8zWNkgRi8g== X-Google-Smtp-Source: AGHT+IF3xWJWxTaU9DfmptsOCWsY0gG8TvpiwHmHLT++c27/MuLOHLyz9TeCOypLO5tZU1bEgVZY X-Received: by 2002:a50:8d0f:0:b0:578:34d3:c89 with SMTP id 4fb4d7f45d1cf-578519b275emr3047868a12.28.1716588333433; Fri, 24 May 2024 15:05:33 -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 4fb4d7f45d1cf-5785e9f6f38si855150a12.570.2024.05.24.15.05.33; Fri, 24 May 2024 15:05:33 -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=XBWBXCaB; 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 8DA0F68D5AE; Sat, 25 May 2024 01:05:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2056.outbound.protection.outlook.com [40.92.89.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D21D768CBDF for ; Sat, 25 May 2024 01:05:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ctme3pvlX3YbyBBNNwc0qgIFh+af+kmN2Nm6yOPHM/WjeVNQMnJ/+3xpMvDF2Wd4G902vDOlUqlr+HiFwfcEhHjHnHFZJB/p5oPDn+Oo79zx8irhIrcJKbwIsddxUNFnYLXCr4PRL0QCDsSkaHwUQ2KbQKittH6GX1JLjNfdZti9gtpe3qkYgsya/bvqbHfjZ/egEN+dq+oeRpmI0nEDrMlTXp9lmUyypo0o2k6MiqKTWQa++/N1fZgy3qrQ6sP1bJbyfNHdg47XU5+9OOu4zvmm9dzYa4MN87z67G7nBBb6N3/o0u34kXPFQx4Z+saQIKHl1vgMJ/s/iC0R2/t3JQ== 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=AjeK9t3vhyR1SLvOvT0hfzwTvfByxYsaIl5vMCZ8+Hc=; b=UaZF2nPEVLZ/sjmlzN8c9m8hPiE/L35qjHi+WOBG2w3LCKBqCyeRUATqSXoeCqZxlLOO1CdyOS5004CEB1ZoLdPRANoA+RHRqF8ok0ZwtBkf4pwiIo4kpDkVbmMRm6CRzXROw4Crxvma5B0HOBgdpxmZKiY7siW9JbpNbuTBEQ23KIjSFN3w6lX4pld1JVMw1DsRM1hiRya5YBZEdRr0SC5lhFJRKcZjaMvEgrVfoc+ThsqILF3fEv0JyWj+pTd+zgar/sCb0IiMjGkWCOeJ6D96y/n6aq4Qp2ry7jHduNTHz7sSNc48vMWBuKYSt9C+YPTwYxwAGdqPJGT66U5AZg== 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=AjeK9t3vhyR1SLvOvT0hfzwTvfByxYsaIl5vMCZ8+Hc=; b=XBWBXCaBb13g249rgdHkP+cYVnJm0bOSfX+oaYHU0dfwrnD+ED78avBJQpbBXWbEoIp6Vd3cK/HYvucEz01bm7IYrRvWQfEdPKEyCLZFIjMCUppaKztsrYny9+Rni04UIB3yBE7ZZ5anj8+2dJ6B2Zwy95KIm8RDE2ZFcL1Owk0JAdENCGRVj5u35PVp2tANngChJY9mYMdDjDqVeoyxwYlzST+/H70yd0Ka+2BK7G93mJ7VCMTIzlzB9S6F9+LnVDd06WrbSUFGLMUYiam0SAr2KjdlB9i65hAF3DfRo1BEblSSrb5n63BFxrhpcWvkj1adzFwbvenkiMXS/X5UfA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:13 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:47 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [geIj+VNTF0qKPDGPUZHg/EnIuzdQUekwcRwDJfRlz4w=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: e57c5696-ce9f-4f4d-4edf-08dc7c3d9644 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: HJKk7wD66s41k4SUZw3DDnw2WgqK8aVV5T6uw/8UgwvrWu43P61f93N4Eja8A1XtYGoFmehOVMQgmaoadvgKAt6SOy5EVMJV+GltcXBAPo+yeII0TqS8pqeyigzjKBF8wl7UCFJ+2faR6XIZwbifxVaBELUUkhy1IkuH03ezaMdJSJERt469jjAb2L9Ph0lTjfygc73CWA2h6GfJD//rMlr2j+Guh91AaDXP46hUjGaNP03xpQMLh65ookkvXp/H9EJiDI46s3+HiqtRGcxbv7djBK6gm8enPtCjyxRro91at3nFDHxoiKAEshMyCLnHQAgmk5t60ts42EVN5pi+yL8iiBLLtd6x+WRinbKDBLp48SOrL6jxH5VzXuCSNU140hJpY5/8ghPkp7RIB9LdysGOGbgraBmWx25S6e9NxGDMD+thcz39Rp/9Dep6xMeX1+dHEMOaHynfV4u4zrwSl+axdpZotLsGutHI4D6kboNDQtwLqOvUmqC6e+WIqF5cjeeMWL+oAiBMbCGmbgwNqOSvn+KRbB+H400A5IJkSpzddkUUzhFWFW3IDHRgXojmVj2eE4rHmTr1ov79TmarqA2zGU8Zl7httz7VNjcoTzdmP3pIAdN3y6pCqg+iuR5v X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /5i5sHqSWz8yhX6hGkJ4hGUjTqwiQc9WAGkL0qy+4kQLyMpDtoU0nkct+zA7ogQMDOWiwoZMMbHnWa8ThVelB9Ho8S/GR3eivFbmpVV6UuHmg0c/7NUEQ0rjkE1E4VSPN3yrP8tTEXzWMItcmECbVA6itP0pIZ4hJ3tF2gENiXOL1GZHe5z1BgiwgiQVLNfc5pNyUn+hHk/tRmyNj0exRWqqygTYUsVoMwbfsx4EehVKWDKFqxuyWVg+pv6v13xAxOdnut/CPetZTMxk98ECmzQ1N7jhgMr88+GkbLHQzrqbZb/V9Y6+gDYifrrIAqjbzKRdXj4JAlfxtA0ghr1z+T/KMZ6SrAI+PlDFEPzm2j/EE4Dg5/MNgvVh3FwnQOjABN544TQmn98AV97zWDGz7yoY7Vc4E7vvTmwcMYsJTOHKBSXbXcJ83pXn+I8WUddee3tqxiOSg3f41jgDXRV8npCcHKYiQAsdY7a/Q/f2nPD+9P0b3h+xAfJgHZTRloN9l4UUpFSn+bhD9mWaMd+Hb0aaSrAxWCG+MBqc+EsK5KG0xYkmmoboXUbtvwVMTi2BDyFuSXrxLtYAQRyaMjM9vAWWrYpT+GPiQRmozTnEQWDnM4rQn7CJ+DYWeWKsgzM7pydiq0M9gnGARj8XHZjG+k270vxS1eueZIkWZEwuaJU16SlS9PUQ1kBuwLIkXIXNe9INDjJJY+znWiLpM4ap0lhWwqLNVLv1cElUwAIcsuOj3eWKfEXWQMcAljbl1FWGn0wQy6YDVxBFcMLZMxYBLx3oL0ZDiJpduXMtQkiMGtChABr/8yWYeDI5CXNusAQOVp6CJejDPcyv4/b0MS2/z3P1SGXUOvl7o6zCWYaIXTQqSsrWTo2W/g8vk6vnFJeBXFzj3HYL2iZ0T5ODZb8tiHwC/Og3Poky2aV5foPM0XT3Ag7tyQUznYLpednXCp0AsdH96j8JuvHOqwNEGae9HqoGd16G8KmCeyNx9nEgyVsOZj8lmiyc0v6U1EqY/ZMlYJhO7A0i68K/QdHsbkajzRtTbembtarkPf73xIGejGAq9oZUGeqQRvf+WnZL5o20ea4kcNUyW9f+pM0QQpASYB9nRRQDkW+CbyHQC0Rui/A4k6oFUCHgkjs594qjKUO8g8ceICtapF1xRM7b+3qo5Uvz2xmLl48DpjwufHAXz345df3cId1XfQkUuseE3dAjCZ2wdINET9yB39UsQGdEk4noh6WoUXdE9X1GUZznBjnkl7G46AzkoYITlaZmNY4cFPpBfrFZRO3W1Bv/S8de6A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e57c5696-ce9f-4f4d-4edf-08dc7c3d9644 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:13.7052 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 04/12] all: Use put_bytes_output() instead of put_bits_ptr - pb->buf 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: 1nATK21qYx4X Avoids accessing internals of PutBitContext. Signed-off-by: Andreas Rheinhardt --- libavcodec/ljpegenc.c | 2 +- libavcodec/proresenc_anatoliy.c | 2 +- libavcodec/wmaenc.c | 2 +- libavformat/mpegenc.c | 4 ++-- libavformat/swfenc.c | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 46546e2160..3443951af5 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -252,7 +252,7 @@ static int ljpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ff_mjpeg_encode_picture_trailer(&pb, header_bits); flush_put_bits(&pb); - pkt->size = put_bits_ptr(&pb) - pb.buf; + pkt->size = put_bytes_output(&pb); *got_packet = 1; return 0; diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 7b7618af9b..6ddb799297 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -382,7 +382,7 @@ static int encode_slice_plane(int16_t *blocks, int mb_count, uint8_t *buf, unsig encode_acs(&pb, blocks, blocks_per_slice, qmat, scan); flush_put_bits(&pb); - return put_bits_ptr(&pb) - pb.buf; + return put_bytes_output(&pb); } static av_always_inline unsigned encode_slice_data(AVCodecContext *avctx, diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 6949f08fb6..eaf0498ea2 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -425,7 +425,7 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, put_bits(&s->pb, 8, 'N'); flush_put_bits(&s->pb); - av_assert0(put_bits_ptr(&s->pb) - s->pb.buf == avctx->block_align); + av_assert0(put_bytes_output(&s->pb) == avctx->block_align); if (frame->pts != AV_NOPTS_VALUE) avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->initial_padding); diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 6b6763c30f..068bc9d71e 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -124,7 +124,7 @@ static int put_pack_header(AVFormatContext *ctx, uint8_t *buf, put_bits(&pb, 3, 0); /* stuffing length */ } flush_put_bits(&pb); - return put_bits_ptr(&pb) - pb.buf; + return put_bytes_output(&pb); } static int put_system_header(AVFormatContext *ctx, uint8_t *buf, @@ -269,7 +269,7 @@ static int put_system_header(AVFormatContext *ctx, uint8_t *buf, } flush_put_bits(&pb); - size = put_bits_ptr(&pb) - pb.buf; + size = put_bytes_output(&pb); /* patch packet size */ AV_WB16(buf + 4, size - 6); diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index d106e16d19..fc883b8023 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -124,7 +124,7 @@ static void put_swf_rect(AVIOContext *pb, put_bits(&p, nbits, ymax & mask); flush_put_bits(&p); - avio_write(pb, buf, put_bits_ptr(&p) - p.buf); + avio_write(pb, buf, put_bytes_output(&p)); } static void put_swf_line_edge(PutBitContext *pb, int dx, int dy) @@ -189,7 +189,7 @@ static void put_swf_matrix(AVIOContext *pb, put_bits(&p, nbits, ty); flush_put_bits(&p); - avio_write(pb, buf, put_bits_ptr(&p) - p.buf); + avio_write(pb, buf, put_bytes_output(&p)); } static int swf_write_header(AVFormatContext *s) @@ -323,7 +323,7 @@ static int swf_write_header(AVFormatContext *s) put_bits(&p, 5, 0); flush_put_bits(&p); - avio_write(pb, buf1, put_bits_ptr(&p) - p.buf); + avio_write(pb, buf1, put_bytes_output(&p)); put_swf_end_tag(s); }