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 21BFD4E423 for ; Tue, 11 Mar 2025 13:04:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E407468E0C9; Tue, 11 Mar 2025 15:04:37 +0200 (EET) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B30F968DE58 for ; Tue, 11 Mar 2025 15:04:31 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0364444254 for ; Tue, 11 Mar 2025 13:04:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1741698271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6sA+hA1mT83qDuf+0nn03YKFHCQ1d1SVEa165kOfL1c=; b=mbIHvvLCvYo3yK8t40QPccwjo1czkyWNZEY7Ejpb5a1S/XcTC2Sx4ZkWBlDWoBnCgJk5dE Y8npaDUhznXTZqpC05sWsVLvuVhUdwI/fQ6tK+dbbFLkUw7c+Tn1zFJIN89JXzz0cHUBc5 3YrXbxEw4CYqSQH7MSs/iXJs6/jNFIMMTygAkibl3svi2p/PciTrtgqaZ2DDl7uCiROD1u 45j9JJy3N8KMOtfgFYy3dXWNs/PacZaY4yCV5Jr/IVlLRdQZxtOT3uw+y5EKTkpQAq9yn6 BEJasSf1RiHco8oUZnCUt5mc+EVWptS69ym1JjVzEZedMbKY5dExoSLGQQe5pg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 11 Mar 2025 14:04:30 +0100 Message-ID: <20250311130430.449887-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-GND-State: clean X-GND-Score: -70 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvddvfedtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpefhledvvdehgfettdefueevtdeifffhkeeljeetjeeugfelgfffieduheevvefgvdenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avcodec/ffv1enc: Factor set_micro_version() out of ff_ffv1_write_extradata() 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: and call it from ff_ffv1_encode_init() setting micro version from code writing the extradata is messy, this should be cleaner Signed-off-by: Michael Niedermayer --- libavcodec/ffv1enc.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index ddada6bc404..f2628aa77a8 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -392,6 +392,22 @@ static void write_header(FFV1Context *f) } } +static void set_micro_version(FFV1Context *f) +{ + f->combined_version = f->version << 16; + if (f->version > 2) { + if (f->version == 3) { + f->micro_version = 4; + } else if (f->version == 4) { + f->micro_version = 4; + } else + av_assert0(0); + + f->combined_version += f->micro_version; + } else + av_assert0(f->micro_version == 0); +} + av_cold int ff_ffv1_write_extradata(AVCodecContext *avctx) { FFV1Context *f = avctx->priv_data; @@ -414,15 +430,8 @@ av_cold int ff_ffv1_write_extradata(AVCodecContext *avctx) ff_build_rac_states(&c, 0.05 * (1LL << 32), 256 - 8); put_symbol(&c, state, f->version, 0); - f->combined_version = f->version << 16; - if (f->version > 2) { - if (f->version == 3) { - f->micro_version = 4; - } else if (f->version == 4) - f->micro_version = 4; - f->combined_version += f->micro_version; + if (f->version > 2) put_symbol(&c, state, f->micro_version, 0); - } put_symbol(&c, state, f->ac, 0); if (f->ac == AC_RANGE_CUSTOM_TAB) @@ -742,6 +751,8 @@ av_cold int ff_ffv1_encode_init(AVCodecContext *avctx) s->num_v_slices = 1; } + set_micro_version(s); + return 0; } -- 2.48.1 _______________________________________________ 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".