From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 390BC4A859
for <ffmpegdev@gitmailbox.com>; Mon, 24 Mar 2025 17:41:23 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4CF45687C30;
Mon, 24 Mar 2025 19:40:05 +0200 (EET)
Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net
[217.70.183.194])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2CFF687C09
for <ffmpeg-devel@ffmpeg.org>; Mon, 24 Mar 2025 19:39:53 +0200 (EET)
Received: by mail.gandi.net (Postfix) with ESMTPSA id 3D0B0441A8
for <ffmpeg-devel@ffmpeg.org>; Mon, 24 Mar 2025 17:39:53 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc;
s=gm1; t=1742837993;
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:
in-reply-to:in-reply-to:references:references;
bh=F7FOTU8v2Z41d9M2LBFQ0730hbnFDOLggN4la3HmJkU=;
b=HlDhXUIFCuj5Yc1DBF9Bq4sRP6x6XzXsxAxi3HdfrDuah8qP1GRLa2Tw2g3BNiv6YFlfHb
K+5tsISHvisr2HIn7PC/SVRgZ1E5Uw22Cf3Cmc6T95Tpzsa2fyoF8TDI6Sx8NRq+DiIhGt
4LGAttC193Io5K0PAJtlXkLnYP4WUuxjRZiPa3+S1Nr7gaM1O89ppiwoJ9HgHcbXI7ZVDX
HAJaDwTMbBpFXmI9KS5peTT83ovsCxdhJRWOOZDCBsnakE4xm2FXdTeNks5LpHbvxZUNzN
XQPOxRkPcfpObiKWErOLEcZYtet0/icQz5rTBtvBdBuXz/9VJ04uQstxEpBQWw==
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Date: Mon, 24 Mar 2025 18:39:42 +0100
Message-ID: <20250324173945.2574461-8-michael@niedermayer.cc>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250324173945.2574461-1-michael@niedermayer.cc>
References: <20250324173945.2574461-1-michael@niedermayer.cc>
MIME-Version: 1.0
X-GND-State: clean
X-GND-Score: -70
X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduiedtfeelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpedvgfefudeijeetieejkefgfffhtdeludeuffdvfeelieevjeetvedufeetfeejfeenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg
X-GND-Sasl: michael@niedermayer.cc
Subject: [FFmpeg-devel] [PATCH 08/11] avcodec/ffv1enc: introduce step to
simplify code
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250324173945.2574461-8-michael@niedermayer.cc/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/ffv1enc.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 49d1d56af24..962ea4abe48 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -1334,21 +1334,19 @@ static int encode_float32_remap_segment(FFV1SliceContext *sc, Unit unit[4][65536
if (s.last_val != val) {
int64_t delta = val - s.last_val;
+ int64_t step = FFMAX(1, (delta + current_mul/2) / current_mul);
av_assert2(s.last_val < val);
av_assert2(current_mul > 0);
- val = FFMAX(1, (delta + current_mul/2) / current_mul);
-
- delta -= val*current_mul;
+ delta -= step*current_mul;
av_assert2(delta <= current_mul/2);
av_assert2(delta > -current_mul);
- val += s.last_val;
- av_assert2(s.last_val < val);
+ av_assert2(step > 0);
if (s.lu) {
s.index_stack[s.run] = s.current_mul_index;
av_assert2(s.run < FF_ARRAY_ELEMS(s.delta_stack));
- if (val - s.last_val == 1) {
+ if (step == 1) {
s.delta_stack[s.run] = delta;
s.run ++;
av_assert2(s.i == s.pixel_num || s.last_val + current_mul + delta == unit[s.p][s.i].val);
@@ -1371,14 +1369,14 @@ static int encode_float32_remap_segment(FFV1SliceContext *sc, Unit unit[4][65536
}
} else {
av_assert2(s.run == 0);
- put_symbol_inline(&s.rc, s.state[s.lu][0], val - s.last_val - 1, 0, NULL, NULL);
+ put_symbol_inline(&s.rc, s.state[s.lu][0], step - 1, 0, NULL, NULL);
if (current_mul > 1)
put_symbol_inline(&s.rc, s.state[s.lu][1], delta, 1, NULL, NULL);
- if (val - s.last_val == 1)
+ if (step == 1)
s.lu ^= 1;
- av_assert2(s.i == s.pixel_num || s.last_val + (val - s.last_val) * current_mul + delta == unit[s.p][s.i].val);
+ av_assert2(s.i == s.pixel_num || s.last_val + step * current_mul + delta == unit[s.p][s.i].val);
if (s.i < s.pixel_num)
s.last_val = unit[s.p][s.i].val;
}
--
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".