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 385054E9C4
for <ffmpegdev@gitmailbox.com>; Thu, 20 Mar 2025 01:19:28 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A0284687B6C;
Thu, 20 Mar 2025 03:19:24 +0200 (EET)
Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net
[217.70.183.199])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45990687B5A
for <ffmpeg-devel@ffmpeg.org>; Thu, 20 Mar 2025 03:19:18 +0200 (EET)
Received: by mail.gandi.net (Postfix) with ESMTPSA id 7686344384
for <ffmpeg-devel@ffmpeg.org>; Thu, 20 Mar 2025 01:19:17 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc;
s=gm1; t=1742433557;
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=obP83Fhlod6sWRs3ry+zEHlklGbnIQtjt91ThwPSd00=;
b=ehUXVmp+jKegRn7l3eC1al95+EiGDOyjBaWOwB9g+TRQV/stHqZqN/ln7Fu92I3eJ9pnpH
7hDVKzpveZuAebqWwn7ZiexOaZNIxzAr9Ag8gd+GOEDuTFMKhiUj3weczhXtvsjx9cecQy
poeWm7d/6OxcYwk+c2cDTZoZpxjZ6SdtjfZSYRsrSEEKgEGvphDMrwyMCAkFHiANuLJkum
UlL92RciRMcxh95iVFBI8LEVzy5FpILpxuCSW2b9RlvEca3SaGWo6RXhxi73LfM27K5dzb
DnUnxmsUYxdILyvE8nFTeJQa7S1Wtf9WboPPG+1DvwzG/YgKePyHgS2blQO9ow==
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Date: Thu, 20 Mar 2025 02:19:13 +0100
Message-ID: <20250320011916.2549051-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: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddugeeikeejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpefhledvvdehgfettdefueevtdeifffhkeeljeetjeeugfelgfffieduheevvefgvdenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg
X-GND-Sasl: michael@niedermayer.cc
Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/ffv1: Fix remap ordering
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/20250320011916.2549051-1-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/ffv1dec_template.c | 6 +++---
libavcodec/ffv1enc.c | 2 +-
libavcodec/ffv1enc_template.c | 12 ++++++------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c
index f9499931b1d..cc0f6f97691 100644
--- a/libavcodec/ffv1dec_template.c
+++ b/libavcodec/ffv1dec_template.c
@@ -198,9 +198,9 @@ static int RENAME(decode_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc,
r += g;
}
if (sc->remap) {
- r = sc->fltmap[0][r & 0xFFFF];
- g = sc->fltmap[1][g & 0xFFFF];
- b = sc->fltmap[2][b & 0xFFFF];
+ g = sc->fltmap[0][g & 0xFFFF];
+ b = sc->fltmap[1][b & 0xFFFF];
+ r = sc->fltmap[2][r & 0xFFFF];
if (transparency)
a = sc->fltmap[3][a & 0xFFFF];
}
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 64add25b407..72ce22adfb0 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -432,7 +432,7 @@ static void set_micro_version(FFV1Context *f)
if (f->version == 3) {
f->micro_version = 4;
} else if (f->version == 4) {
- f->micro_version = 5;
+ f->micro_version = 6;
} else
av_assert0(0);
diff --git a/libavcodec/ffv1enc_template.c b/libavcodec/ffv1enc_template.c
index 8b2d938770f..779e83dad66 100644
--- a/libavcodec/ffv1enc_template.c
+++ b/libavcodec/ffv1enc_template.c
@@ -168,9 +168,9 @@ static void RENAME(load_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc,
r = *((const uint16_t *)(src[2] + x*2 + stride[2]*y));
}
- sc->fltmap[0][r] = 1;
- sc->fltmap[1][g] = 1;
- sc->fltmap[2][b] = 1;
+ sc->fltmap[0][g] = 1;
+ sc->fltmap[1][b] = 1;
+ sc->fltmap[2][r] = 1;
if (transparency)
sc->fltmap[3][a] = 1;
}
@@ -230,9 +230,9 @@ static int RENAME(encode_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc,
}
if (sc->remap) {
- r = sc->fltmap[0][r];
- g = sc->fltmap[1][g];
- b = sc->fltmap[2][b];
+ g = sc->fltmap[0][g];
+ b = sc->fltmap[1][b];
+ r = sc->fltmap[2][r];
if (transparency)
a = sc->fltmap[3][a];
}
--
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".