From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id E7F474C576 for ; Sun, 9 Mar 2025 18:18:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 718EB68E674; Sun, 9 Mar 2025 20:18:44 +0200 (EET) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2026.outbound.protection.outlook.com [40.92.49.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5443C68D232 for ; Sun, 9 Mar 2025 20:18:38 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zTSPXkc4DT66n9qyRZJCHmdsnzkw37kaMKkGuQ+xQ0S5zS1F6XokQ/y3VYFkrlXazDoiTRbjBoFZBR/AmlITD6mkiqNFhbzCywVBVtjfWz1Sfx4bnOkJvHpTDtD8EacYKKlBBjQjDTyEL7T+xXmtUWQTs+G5fXjW3GiccgvOMeki6d4p3XE89zQK0kDD/ZXGw1e+pYyIqM4l0uMZk2gAWFE+5hstgI7W7I622if2EPSY/D5MjWd4G5+5IAuKCrn7vdFM8REWsbmJrgxX3zGza8SRayhcwTBMvvJNE/O0IHC0rSq88Eq5iupjIw3QA9y/q1PUK0+XDZcb13O8pkBXQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=brClBMjuTqfMS/R7MMClAT0a3i0a5eaQh8F1+sEyFsU=; b=bXj6fR4j4t7276weZCk1qcE3bYWQKJP5emcA7QkEewxdtyzUjO2NUgAR56MjbiQO++/bK+Sr6/gPybS9EN/inZWvOxeDd6f9RxVv2Vm/qFBT049ENEZJMIaZgbC09jkcN1I/oRb9nGQF0svOzsE6X2q4ovaH6vA4IytSiop5w12njgEeNEGcOaBPZSSX3rBexy7dmqS//SS2UjA2tMOZhydWiHWlDa1JrofotOzA4BMN/nhkZZ12qs1eR5WYE90SanLQx630XVxnUdjloT2OCdb9AgjAO4bWf4HZM2gVR2AHHSVI+tg6Y3fh/5bp4IoqwNkRp6wfwb3C7oDz5aYWHQ== 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=brClBMjuTqfMS/R7MMClAT0a3i0a5eaQh8F1+sEyFsU=; b=DRbi1Tepu0dtKgND/CaHoNAWbKO0VlH4j4XNYOo412iNCqkbVbO+lhuPYL5d0/8Cx5tHj+RKsHx5B+lwJUnI+R3R/ewrF0VbUuuROD77JefqBPOZWo9+Oc+1XhzMSKaLMK7WcuwaDfbOwepXj+O48q3YZ9E+OIVwowcE02g3EgY2DgtZmFr7B4J32sUMyLg+bN05/xx8g4E0RP/UNHls0ZbZoY+CE4tlXy46d7PILB5gLcUkLZ6crueDwdEmKIXpGbbGfvyGKxaRV7YVCtXjLIG8UqEa8z+zEazyN/bvNFfrjSBNWO2xs/FVJktaCr4qdTyEvEcSWKaJa+N07bKKrA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0239.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:278::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.18; Sun, 9 Mar 2025 18:18:37 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%5]) with mapi id 15.20.8534.017; Sun, 9 Mar 2025 18:18:36 +0000 Message-ID: Date: Sun, 9 Mar 2025 19:18:34 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-ClientProxiedBy: ZRAP278CA0018.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::28) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0239:EE_ X-MS-Office365-Filtering-Correlation-Id: 0121f7f6-6a93-4a1a-4270-08dd5f36cf32 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|5072599009|7092599003|15080799006|19110799003|8060799006|6090799003|3412199025|41001999003|440099028; X-Microsoft-Antispam-Message-Info: =?utf-8?B?S0FpOWFOSHlmYmVMRzJlUFphOXFwWXhaWTFzRDViTTh3ODdqZ0NtNzBWcU9Z?= =?utf-8?B?Zjd6NmZ0cXlFNFJremJRMUdmVVZHMzRqWXZ1M3hqaHM1bW9LNUJUek9JRHA0?= =?utf-8?B?YU1EUjNCL2xFV29rd3ZjdUZTYUJ0YXVWM0ZQU1VxdndUMkdicVU4ZGZiQXRI?= =?utf-8?B?c0Nqa1Q3amR6b2hJajVleEZLQ0VlUUhXWnFXZlZlQXpxbWJYYjBCNFRZZC9x?= =?utf-8?B?ZE4xU1RSb3FQaWZlUGt4ditqV3dwZ05HblR2bkc2eVVqTG9Jdm1lSjhXRWJo?= =?utf-8?B?QWQwK0tSVHE1WDFWdkFReDBFWHdsODZqWHBKdFFOamtUcktlaGtrRXN5YTV5?= =?utf-8?B?Y1VCTklpckg2aDlrL2tjYmh2d0ZzS0U0QkxMdHZSM081SFI0dTFCODUvTnpU?= =?utf-8?B?dVE0K2tyc3RjK1QwZHp0MEdkSTd0VEttcktSMHhpOGIvTHIvVTk2Mkl1Z1FM?= =?utf-8?B?VHlha3pNSDJYcFZuUHFJcEptRzJCM2duRW1Ha3NVWUQzVWFJUm5YaUkvUTRF?= =?utf-8?B?UGhxRlB5V2N0cTVtZGFYRzhrcW50bkhDKy9VRE9oOWFTdDRVK0V1NjNYaUh0?= =?utf-8?B?eVk0a01UK3c4ajlYTVg5WTRJbStJelpnQjBvanRwSTBKeUgzb1Jzd3p0TkZR?= =?utf-8?B?d2xEcm5DczZmeDhJUDJueDV4ZXhMclViTkRaYXoySzgvRFFzTElrOUtzbmdU?= =?utf-8?B?MzByNmJ0WVJ3b1pKTFMzT2xVNXg4eEsvb2gycVRpM0F3MVhabXRTUnJEQ0kv?= =?utf-8?B?Wm9sdEI4c2Q0OU9sd3dLTGNFNzhaOG16aDRMQzBzd3M4ejEzMUNqekkwOGk2?= =?utf-8?B?ZU1CUUNFZkphTkpzNGhlOFppVzZHUDhKeW9KeEwweUlnOEhNS1FDckNRUTdv?= =?utf-8?B?VmVyQlNmZmFqekV6dmx2U2hVUGZYdTNXTVQwSWJyUzNWT2d2R1VrcjBQNjFu?= =?utf-8?B?WUlsN1NtalVCMkNhSU5ScWRZWDB6enJFa2h1b2NManRuVHlhWHBwVGZJVFRa?= =?utf-8?B?bGEvM2NuNE40U3VQK2t1OVhuZzliRHhNeDFRK2s3V1RCS0RTdCtWVmV1d1Zp?= =?utf-8?B?U1lsd0t5cGJHZC9uLzBFZ3JTZE1mQXlGUDl6OVBUVUhhYTNJZ3hRbUN3MTQv?= =?utf-8?B?TXpUZWVzbGlzcFRRWGtoSXJuOG8zblpkZ3MvWjhTWWhGN2FlMW9QS2RJNkZp?= =?utf-8?B?NjViL0ZwY3dRZnFTK1JEV1hMUTR3WXBUSmw3Tjc1TWZVS29UaW5XellpRjB2?= =?utf-8?B?bWNXbjlETnBiOUFIQ3FCQ2tPcXBWaFFhbjFldVhEdFkzeE1UQ0NmaHFydXkx?= =?utf-8?B?U1VEemd3TFlhV2U0QW9DRWRLVmV6L2ZQU3JSTmdIR2xsN2RyblVJMW4vRkEv?= =?utf-8?B?NVowcWxBd3phOVRycEVmUlExWXdqdzBJVjVVNiswb3l5Ujg0aSs5Y2kxQzBM?= =?utf-8?B?K0tRcEdoMTFHMWIraGhHZnBHT0FlMUZVNWhxeWhUUUlxU2F1eks5amxVQW5S?= =?utf-8?B?V3dqV0dsWmhORnFXbVRxV08rc0xKdUgvYk5LV3FYWDVaQkdVWm1XVm1pS3dr?= =?utf-8?B?MG5zQT09?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TzBzTlZCelJIdyt4N29PYUNqOUNsRGtvcHlHU3VBc1gveEFZcHJZK1NzR3FT?= =?utf-8?B?MkNSbkE2QVFGZ3loTDJqL3Y1TEphUHloTWRTNkRiNUNlY2J6TU53TkNWSFNz?= =?utf-8?B?UWpjRHZ0R0cxZ0JLVTZ5bDFMYVZENkdja0pxVTJNL2JSUkpIMUdnMXdSeXRp?= =?utf-8?B?UlA0Q0xBMGpyb29RemdzWFNzR2RWcnRCSlRUR0xCaCt4RjY1QmlaQkd4Z3dj?= =?utf-8?B?WG5rWkNuK0RnN0lWNzB0ZnlrcVZPSjVhZzRqV2J1M0FkLzlRVmVRMk9pZW9w?= =?utf-8?B?REJpbDBleFR3SEZVeVVVZmp3akk5N0ppQTdFczI3WDdPWEg5Z3pXbkRKaTRW?= =?utf-8?B?Vm9LZXVxWnorQmxoODVvSGE0b20yeGZIWGl2eUpkSW1SdU42NVNLSWMxS3ow?= =?utf-8?B?b1p3MzV6UnR0ZFZoQXVJemhzajJKdVRyR1BzYkJYWmhmSEMrZnY4R0pWTE1K?= =?utf-8?B?SERCejFpQmQvdU9LTk8zQWhXWUZmN0lmWUl0cG8wOVZaTkY1TW1tajMzRFFW?= =?utf-8?B?U1lmd3VPWmRRNEtwN2tDUU12RlJ2ZU5Ba21FRUNXVE5RSFAwUkFWWitPQ2Nj?= =?utf-8?B?eTVTdjV6Q21ZblpkcGh4YTlZcWpyNTFKRU10a1p3MkJNa2pEQ3EwYytZdGF0?= =?utf-8?B?UHc3VXZacXFhSGFlRzlLQWdCb2hPM1RPK1BmNng1YzJkbnRGdlJsME5UejlX?= =?utf-8?B?a3VNYU5jTitvNWtaaTU2eVh3SG95UGN2bzUyb21Bck5yU1R5NGpYOGZRTGUw?= =?utf-8?B?QWp1aVBlQWM1M3VaL3FQd3RTYlp4QmxCWkFicnJEYnVESVJXM29BTEpIb1Aw?= =?utf-8?B?UUM3bDlUMkpybzFJSDl4M3hvakpjK2hvTGFWZ3hNc0djMExwS3hNcjc2eVli?= =?utf-8?B?VlpmMkVqNjZlUDlDb1pmSFVOeFhzUktibXdGZ3VXTWRXbWwvd3plTUN1bVNr?= =?utf-8?B?ekpvWnVtUXIxbVVaU3A5M29KM013Q3lDNTBJVENkWUlIRFh1VVZiOUtRSVNS?= =?utf-8?B?QjVHRnJHbkRzSkZOQXpUVEE4d09ucjh5WUtQc3hCWXFoOE1NR240NzR3a3RM?= =?utf-8?B?bmRISnJ5UGYxYTZOZ0xMN2dZc3lqVTk0elEweVI5R0hSbTIvZ2N2TVg4Zzdi?= =?utf-8?B?aWZMd0FQenY4eEpLMFRCdVR1QXozZ0VDb1AzUWxWQTVBajJjZkY3Q3RmblZu?= =?utf-8?B?NGM4cnNIRG4yc1dCNVh3bW9uUXZqQnU2L3FPT3d4Z3JqekZ6UE1DTHc1VlI4?= =?utf-8?B?MHpGdUNubnlOeEpqYUgvaWZoLytzZm1BNGtVMHZRdGd6cTIxQkZ4VW9hSkNK?= =?utf-8?B?cG9tcFlmTzNHRk9IWWdBODBwTFdIL0lqa1lkUzBIZ003aW5GSmNiZlNHb1pF?= =?utf-8?B?NzFuOTNud2V4bitNN2d1ZjA4bGJyeC8zUDJlZXF1dml4M2dmcEFlVEErb2xz?= =?utf-8?B?UmxNZU5oVHp6b1IzMmpOenBvQ3V0TDMyMFA5TURmS01LL21iWlcyWTBQSUU0?= =?utf-8?B?OEQ0SEpINVY0TW9WdlkrY2xZRURMNkkzQWNwdGs0cFRTZHhrT01ubExXRm10?= =?utf-8?B?dThiUjdMc3NTcTlPMHJCWEtWcnhMT2F5Y1hxRVdRNUNVWEVJQ3ZRejJ6ZElK?= =?utf-8?B?dWw2bWZOVTFid202TGdwOFlOeGludExsZVNzWnFWQWltZWdKdnRIZWg1MjRX?= =?utf-8?B?ZWlEc3NoMWFiZkdlZHhXdjE3c2dkaVpRdFQyYlpsTEtDbkRzb01vOVNnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0121f7f6-6a93-4a1a-4270-08dd5f36cf32 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2025 18:18:36.9309 (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: DU2P250MB0239 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > 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); > } Will apply tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".