From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/ffv1: Fix remap ordering
Date: Thu, 20 Mar 2025 02:19:13 +0100
Message-ID: <20250320011916.2549051-1-michael@niedermayer.cc> (raw)
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".
next reply other threads:[~2025-03-20 1:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-20 1:19 Michael Niedermayer [this message]
2025-03-20 1:19 ` [FFmpeg-devel] [PATCH 2/4] avcodec/ffv1: 32-bit float sample support Michael Niedermayer
2025-03-20 1:19 ` [FFmpeg-devel] [PATCH 3/4] avcodec/ffv1enc: remap allows using rice golomb with more bits Michael Niedermayer
2025-03-20 1:19 ` [FFmpeg-devel] [PATCH 4/4] avcodec/ffv1: RC/RLE/LRU coder for remap table Michael Niedermayer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250320011916.2549051-1-michael@niedermayer.cc \
--to=michael@niedermayer.cc \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git