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 683244B0E7
for <ffmpegdev@gitmailbox.com>; Tue, 25 Mar 2025 13:10:03 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3CF97687BA1;
Tue, 25 Mar 2025 15:09:49 +0200 (EET)
Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net
[217.70.183.196])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B4A7687B96
for <ffmpeg-devel@ffmpeg.org>; Tue, 25 Mar 2025 15:09:40 +0200 (EET)
Received: by mail.gandi.net (Postfix) with ESMTPSA id 625DE433D6
for <ffmpeg-devel@ffmpeg.org>; Tue, 25 Mar 2025 13:09:40 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc;
s=gm1; t=1742908180;
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=8tLPnBEDVJbe4rxry/og+b+1Oe0IYDkLhF65cWz46nE=;
b=lfVEFlkyP+K3IqAlfYOGPIVt8Op4gEgpdEjt7gjc9Ege47Vnh5p+uJiEMZv4/rwYe3mfvu
Le50pnuKaQXxgwcE5r4qhaInAYiuiNc3xVNIOCHwcQhjRiSbAqucNTdniSxMa1nzBY2Vlh
VDcZCQij9513T8S5ikO+ZpuQFsKuQibGH8RbXbYbpaduSHm+9/E4e24KTF+mx+vrGaVgNL
AcSkBR43R6s+bXG+tUg5Fk192jUZsvLFMbHV7IU3L7imFhJVhKe5+oyM9HaSg/MmQmAT9m
zqbYZyvt947f2iqZ3RDnVK3Jt7h+O9zNjkuwPUqItCGxgwLnPVzYQ1gxfsOeTA==
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Date: Tue, 25 Mar 2025 14:09:38 +0100
Message-ID: <20250325130938.598361-2-michael@niedermayer.cc>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250325130938.598361-1-michael@niedermayer.cc>
References: <20250325130938.598361-1-michael@niedermayer.cc>
MIME-Version: 1.0
X-GND-State: clean
X-GND-Score: -70
X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduiedvjeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpedvgfefudeijeetieejkefgfffhtdeludeuffdvfeelieevjeetvedufeetfeejfeenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg
X-GND-Sasl: michael@niedermayer.cc
Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/ffv1enc: compactify unit table
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/20250325130938.598361-2-michael@niedermayer.cc/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
This way the remap encode loop needs fewer iterations and it allows
some additional simplifications
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/ffv1enc.c | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 0c879fe5ce5..143c378c1b5 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -1310,23 +1310,28 @@ static int encode_float32_remap_segment(FFV1SliceContext *sc,
s.run1final = 0;
}
- if (final) {
- int64_t last_val = s.last_val;
- for (int i = s.i; i<s.pixel_num; i++) {
- int val = sc->unit[s.p][i].val;
-
- if (last_val != val) {
- s.compact_index ++;
- last_val = val;
- }
- sc->bitmap[s.p][sc->unit[s.p][i].ndx] = s.compact_index;
+ int64_t last_val = s.last_val;
+ int j = 0;
+
+ for (int i = s.i; i<s.pixel_num; i++) {
+ int val = sc->unit[s.p][i].val;
+ int ndx = sc->unit[s.p][i].ndx;
+
+ if (last_val != val) {
+ s.compact_index ++;
+ last_val = val;
+ sc->unit[s.p][s.compact_index].val = val;
+ sc->unit[s.p][s.compact_index].ndx = ndx; //we dont need ndx but copy all should be simpler and faster
}
+ if (final)
+ sc->bitmap[s.p][ndx] = s.compact_index;
}
- for (; s.i < s.pixel_num+1; s.i++) {
+ s.compact_index++;
+ for (; s.i < s.compact_index + 1; s.i++) {
int current_mul = s.current_mul_index < 0 ? 1 : FFABS(s.mul[s.current_mul_index]);
int64_t val;
- if (s.i == s.pixel_num) {
+ if (s.i == s.compact_index) {
if (s.last_val == 0xFFFFFFFF) {
break;
} else {
@@ -1337,7 +1342,7 @@ static int encode_float32_remap_segment(FFV1SliceContext *sc,
} else
val = sc->unit[s.p][s.i].val;
- 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);
--
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".