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 213EF4B1D4
for <ffmpegdev@gitmailbox.com>; Tue, 25 Mar 2025 14:07:33 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A6F83687BB0;
Tue, 25 Mar 2025 16:07:06 +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 6C80B687BA1
for <ffmpeg-devel@ffmpeg.org>; Tue, 25 Mar 2025 16:06:58 +0200 (EET)
Received: by mail.gandi.net (Postfix) with ESMTPSA id C0E9F44506
for <ffmpeg-devel@ffmpeg.org>; Tue, 25 Mar 2025 14:06:57 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc;
s=gm1; t=1742911617;
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=wfzpPkeQMLlyGC8T2YOaexBfp8uiL5hulpkuQgsWyuQ=;
b=oowba60FhZve+T3nxpmlId5ZDacP6hOEihap6Y515nYji7zAdjawtQDZG8gKDejUhjoitC
NyJa/lxI1xgcr7hs+PbJlChu9dxDkJRneo4BVmWoA4sazUcW5UeAmMUfbZpJJv9GHKUZfq
ALU+B333EgCKynk923rJMAcv/w92PVfC89uTd5kreW/ujMBmT3JnAqVzLWofCBfc+gDOqa
DLTC6sWmzw/tD1qK8OD2H6YZI/H5UXrcT6d/7DZBrzAvf7mC9myILOqTmAP2Ak21AXFsog
5kydqyGbUMgP2t1h9h2KFgmnAJS5Qk+jW2NMRKpwSq+VqbCdCjVTMdmtjD39Og==
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Date: Tue, 25 Mar 2025 15:06:53 +0100
Message-ID: <20250325140655.612516-3-michael@niedermayer.cc>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250325140655.612516-1-michael@niedermayer.cc>
References: <20250325140655.612516-1-michael@niedermayer.cc>
MIME-Version: 1.0
X-GND-State: clean
X-GND-Score: -70
X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduiedvkeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpedvgfefudeijeetieejkefgfffhtdeludeuffdvfeelieevjeetvedufeetfeejfeenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg
X-GND-Sasl: michael@niedermayer.cc
Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/ffv1enc: Fix end handling
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/20250325140655.612516-3-michael@niedermayer.cc/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
This also produces smaller files
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/ffv1enc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 162bf7b804f..f8db3dc2c7d 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -1315,7 +1315,9 @@ static int encode_float32_remap_segment(FFV1SliceContext *sc,
if (s.last_val == 0xFFFFFFFF) {
break;
} else {
- val = 1LL<<32;
+ val = s.last_val + ((1LL<<32) - s.last_val + current_mul - 1) / current_mul * current_mul;
+ av_assert2(val >= (1LL<<32));
+ val += s.lu * current_mul; //ensure a run1 ends
}
} else
val = sc->unit[s.p][s.i].val;
@@ -1379,6 +1381,7 @@ static int encode_float32_remap_segment(FFV1SliceContext *sc,
if (!s.run || s.run1final) {
av_assert2(s.mul[ s.current_mul_index ]);
if (s.mul[ s.current_mul_index ] < 0) {
+ av_assert2(s.i < s.pixel_num);
s.mul[ s.current_mul_index ] *= -1;
put_symbol_inline(&s.rc, s.state[0][2], s.mul[ s.current_mul_index ], 0, NULL, NULL);
}
--
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".