From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 8C8D243D68 for ; Sat, 18 Jan 2025 22:51:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2B17168B44A; Sun, 19 Jan 2025 00:51:00 +0200 (EET) Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E2B668AD89 for ; Sun, 19 Jan 2025 00:50:52 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id CDA0F1BF204 for ; Sat, 18 Jan 2025 22:50:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1737240652; 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=1LwFyDQ2KbgdoEycj3q2baYEH+MzHGsQ0s265n7bCv8=; b=YDN6Qp8ncOYQFoqknGBOLMaSvuCugNMOHFjA22N97ibH1LHBk27FQAzj5dW2l38ZXFRkyr BHWxtbGD9r7zg6KICxaZnxv6kd69UDkj8gKDllHGPbbl6jDaNQ88DMuT7VzZRLIOTBGTWX 2oFhVRW9XO1nKvHOy5emzEVY9WK0Y99qDwZbKbuP5MKND7jhP9hL3ZBR8rEd5i8/3E4bLj TSWaxQ+bxLZO1m2Ou194NBMVn4vKGox7nyYuJ8jLXIjyCwRBcTbVRqgnYv59+CL2nHyTfw rw9QJy4NMC6KcAxsFIjHdQEBwZJDQb5hxbEMKOOQ9NXrWWbwmdoTshXHJx88Fg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 Jan 2025 23:50:50 +0100 Message-ID: <20250118225050.2935283-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250118225050.2935283-1-michael@niedermayer.cc> References: <20250118225050.2935283-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/ffv1: Store remap flag per slice X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This allows switching it on conditionally and also for non float, it may improve compression for RGB data that was paletted or other synthetic images Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/ffv1.h | 1 + libavcodec/ffv1dec.c | 8 ++++++++ libavcodec/ffv1dec_template.c | 4 ++-- libavcodec/ffv1enc.c | 3 +++ libavcodec/ffv1enc_template.c | 4 ++-- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index bf49f613a75..3254ae1b56b 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -83,6 +83,7 @@ typedef struct FFV1SliceContext { int slice_coding_mode; int slice_rct_by_coef; int slice_rct_ry_coef; + int remap; // RefStruct reference, array of MAX_PLANES elements PlaneContext *plane; diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index def95ff411f..db3eedcdc3f 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -248,6 +248,14 @@ static int decode_slice_header(const FFV1Context *f, return AVERROR_INVALIDDATA; } } + if (f->combined_version >= 0x40004) { + sc->remap = get_symbol(c, state, 0); + if (sc->remap > 1 || + sc->remap == 1 && !f->flt) { + av_log(f->avctx, AV_LOG_ERROR, "unsupported remap %d\n", sc->remap); + return AVERROR_INVALIDDATA; + } + } } return 0; diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c index a419aca8584..1fa9933d984 100644 --- a/libavcodec/ffv1dec_template.c +++ b/libavcodec/ffv1dec_template.c @@ -155,7 +155,7 @@ static int RENAME(decode_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc, memset(RENAME(sc->sample_buffer), 0, 8 * (w + 6) * sizeof(*RENAME(sc->sample_buffer))); - if (f->flt) { + if (sc->remap) { for (int p= 0; p<3 + transparency; p++) { int j = 0; int lu = 0; @@ -199,7 +199,7 @@ static int RENAME(decode_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc, b += g; r += g; } - if (f->flt) { + if (sc->remap) { r = sc->fltmap[0][r]; g = sc->fltmap[1][g]; b = sc->fltmap[2][b]; diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 8e9f41fea8f..eba2aab4866 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -946,6 +946,8 @@ static int encode_init_internal(AVCodecContext *avctx) } ff_build_rac_states(&s->slices[j].c, 0.05 * (1LL << 32), 256 - 8); + + s->slices[j].remap = s->flt; } if ((ret = ff_ffv1_init_slices_state(s)) < 0) @@ -1000,6 +1002,7 @@ static void encode_slice_header(FFV1Context *f, FFV1SliceContext *sc) put_symbol(c, state, sc->slice_rct_by_coef, 0); put_symbol(c, state, sc->slice_rct_ry_coef, 0); } + put_symbol(c, state, sc->remap, 0); } } diff --git a/libavcodec/ffv1enc_template.c b/libavcodec/ffv1enc_template.c index 0d1b0a28432..4c7cd2e647c 100644 --- a/libavcodec/ffv1enc_template.c +++ b/libavcodec/ffv1enc_template.c @@ -148,7 +148,7 @@ static int RENAME(encode_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc, memset(RENAME(sc->sample_buffer), 0, ring_size * MAX_PLANES * (w + 6) * sizeof(*RENAME(sc->sample_buffer))); - if (f->flt) { + if (sc->remap) { memset(sc->fltmap, 0, sizeof(sc->fltmap)); for (y = 0; y < h; y++) { @@ -221,7 +221,7 @@ static int RENAME(encode_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc, r = *((const uint16_t *)(src[2] + x*2 + stride[2]*y)); } - if (f->flt) { + if (sc->remap) { r = sc->fltmap[0][r]; g = sc->fltmap[1][g]; b = sc->fltmap[2][b]; -- 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".