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 ESMTP id 16F704BD2E for ; Tue, 16 Jul 2024 17:17:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7921D68DAD7; Tue, 16 Jul 2024 20:16:43 +0300 (EEST) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B94B68DA91 for ; Tue, 16 Jul 2024 20:16:37 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=Vlkk0k+N; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 820454DF1 for ; Tue, 16 Jul 2024 19:16:33 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id xAxJHOv0570j for ; Tue, 16 Jul 2024 19:16:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1721150187; bh=RX/mHqT8iPLiBxrwDB1kue1iRF34wxQYEj9yaQABkxc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Vlkk0k+N2WFeMaZD/3bMuFBxr80cr4DaUmZEXiQjvDTcZBLdA3avaj9ORjujPIPkh fRgf6vb7wXxC9eT75c8w4V8fxn7lBbIylNEfviZBxkRMoMHNZ2hXXQcKsTo49BMwZW ZzAGZEtNGmXxDAfa1fjY+HeHhZCVabUXLiyyIaQWwYvbAEl0cJLHI27U3RxFwE9NjD Jj2Ef757Hp42fWPGOZhF5mFSR3GpQuXqqkO00DajLIa/KkMCXx08P6cp2YPHOqeC1b JIX/PCu8nHwfK2dQbfcCdMhtT6aQ6Zn8yyK2jCuV8f06WXKESBAo+NvapNlICSj+Cr OzBGcJPdhS51Q== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 91D474DF6 for ; Tue, 16 Jul 2024 19:16:27 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id E12313A2B52 for ; Tue, 16 Jul 2024 19:16:20 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jul 2024 19:11:31 +0200 Message-ID: <20240716171155.31838-16-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240716171155.31838-1-anton@khirnov.net> References: <20240716171155.31838-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/39] lavc/ffv1: move FFV1Context.slice_{coding_mode, rct_.y_coef} to per-slice context 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: --- libavcodec/ffv1.h | 6 +++--- libavcodec/ffv1dec.c | 14 +++++++------- libavcodec/ffv1dec_template.c | 10 +++++----- libavcodec/ffv1enc.c | 26 +++++++++++++------------- libavcodec/ffv1enc_template.c | 10 +++++----- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index a3f3b30b49..e466aedbbe 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -77,6 +77,9 @@ typedef struct FFV1SliceContext { int slice_y; int run_index; + int slice_coding_mode; + int slice_rct_by_coef; + int slice_rct_ry_coef; PutBitContext pb; } FFV1SliceContext; @@ -130,9 +133,6 @@ typedef struct FFV1Context { int num_v_slices; int num_h_slices; int slice_reset_contexts; - int slice_coding_mode; - int slice_rct_by_coef; - int slice_rct_ry_coef; FFV1SliceContext *slices; } FFV1Context; diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 6d3db25279..8464697fd3 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -240,11 +240,11 @@ static int decode_slice_header(const FFV1Context *f, FFV1Context *fs, if (fs->version > 3) { fs->slice_reset_contexts = get_rac(c, state); - fs->slice_coding_mode = get_symbol(c, state, 0); - if (fs->slice_coding_mode != 1) { - fs->slice_rct_by_coef = get_symbol(c, state, 0); - fs->slice_rct_ry_coef = get_symbol(c, state, 0); - if ((uint64_t)fs->slice_rct_by_coef + (uint64_t)fs->slice_rct_ry_coef > 4) { + sc->slice_coding_mode = get_symbol(c, state, 0); + if (sc->slice_coding_mode != 1) { + sc->slice_rct_by_coef = get_symbol(c, state, 0); + sc->slice_rct_ry_coef = get_symbol(c, state, 0); + if ((uint64_t)sc->slice_rct_by_coef + (uint64_t)sc->slice_rct_ry_coef > 4) { av_log(f->avctx, AV_LOG_ERROR, "slice_rct_y_coef out of range\n"); return AVERROR_INVALIDDATA; } @@ -294,8 +294,8 @@ static int decode_slice(AVCodecContext *c, void *arg) } } - fs->slice_rct_by_coef = 1; - fs->slice_rct_ry_coef = 1; + sc->slice_rct_by_coef = 1; + sc->slice_rct_ry_coef = 1; if (f->version > 2) { if (ff_ffv1_init_slice_state(f, fs) < 0) diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c index d868617de9..776dc4144f 100644 --- a/libavcodec/ffv1dec_template.c +++ b/libavcodec/ffv1dec_template.c @@ -38,7 +38,7 @@ RENAME(decode_line)(FFV1Context *f, if (is_input_end(s, gb)) return AVERROR_INVALIDDATA; - if (s->slice_coding_mode == 1) { + if (sc->slice_coding_mode == 1) { int i; for (x = 0; x < w; x++) { int v = 0; @@ -161,10 +161,10 @@ static int RENAME(decode_rgb_frame)(FFV1Context *f, sample[p][1][-1]= sample[p][0][0 ]; sample[p][0][ w]= sample[p][0][w-1]; - if (lbd && s->slice_coding_mode == 0) + if (lbd && sc->slice_coding_mode == 0) ret = RENAME(decode_line)(f, s, sc, gb, w, sample[p], (p + 1)/2, 9); else - ret = RENAME(decode_line)(f, s, sc, gb, w, sample[p], (p + 1)/2, bits + (s->slice_coding_mode != 1)); + ret = RENAME(decode_line)(f, s, sc, gb, w, sample[p], (p + 1)/2, bits + (sc->slice_coding_mode != 1)); if (ret < 0) return ret; } @@ -174,10 +174,10 @@ static int RENAME(decode_rgb_frame)(FFV1Context *f, int r = sample[2][1][x]; int a = sample[3][1][x]; - if (s->slice_coding_mode != 1) { + if (sc->slice_coding_mode != 1) { b -= offset; r -= offset; - g -= (b * s->slice_rct_by_coef + r * s->slice_rct_ry_coef) >> 2; + g -= (b * sc->slice_rct_by_coef + r * sc->slice_rct_ry_coef) >> 2; b += g; r += g; } diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index d334220e13..fb373b598b 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -926,13 +926,13 @@ static void encode_slice_header(FFV1Context *f, FFV1Context *fs, put_symbol(c, state, f->cur_enc_frame->sample_aspect_ratio.num, 0); put_symbol(c, state, f->cur_enc_frame->sample_aspect_ratio.den, 0); if (f->version > 3) { - put_rac(c, state, fs->slice_coding_mode == 1); - if (fs->slice_coding_mode == 1) + put_rac(c, state, sc->slice_coding_mode == 1); + if (sc->slice_coding_mode == 1) ff_ffv1_clear_slice_state(f, fs); - put_symbol(c, state, fs->slice_coding_mode, 0); - if (fs->slice_coding_mode != 1) { - put_symbol(c, state, fs->slice_rct_by_coef, 0); - put_symbol(c, state, fs->slice_rct_ry_coef, 0); + put_symbol(c, state, sc->slice_coding_mode, 0); + if (sc->slice_coding_mode != 1) { + put_symbol(c, state, sc->slice_rct_by_coef, 0); + put_symbol(c, state, sc->slice_rct_ry_coef, 0); } } } @@ -1016,8 +1016,8 @@ static void choose_rct_params(FFV1Context *fs, FFV1SliceContext *sc, best = i; } - fs->slice_rct_by_coef = rct_y_coeff[best][1]; - fs->slice_rct_ry_coef = rct_y_coeff[best][0]; + sc->slice_rct_by_coef = rct_y_coeff[best][1]; + sc->slice_rct_ry_coef = rct_y_coeff[best][0]; } static int encode_slice(AVCodecContext *c, void *arg) @@ -1039,12 +1039,12 @@ static int encode_slice(AVCodecContext *c, void *arg) p->data[2] ? p->data[2] + ps*x + y*p->linesize[2] : NULL, p->data[3] ? p->data[3] + ps*x + y*p->linesize[3] : NULL}; - fs->slice_coding_mode = 0; + sc->slice_coding_mode = 0; if (f->version > 3) { choose_rct_params(fs, sc, planes, p->linesize, width, height); } else { - fs->slice_rct_by_coef = 1; - fs->slice_rct_ry_coef = 1; + sc->slice_rct_by_coef = 1; + sc->slice_rct_ry_coef = 1; } retry: @@ -1084,13 +1084,13 @@ retry: } if (ret < 0) { - av_assert0(fs->slice_coding_mode == 0); + av_assert0(sc->slice_coding_mode == 0); if (fs->version < 4 || !fs->ac) { av_log(c, AV_LOG_ERROR, "Buffer too small\n"); return ret; } av_log(c, AV_LOG_DEBUG, "Coding slice as PCM\n"); - fs->slice_coding_mode = 1; + sc->slice_coding_mode = 1; fs->c = c_bak; goto retry; } diff --git a/libavcodec/ffv1enc_template.c b/libavcodec/ffv1enc_template.c index 0f47a0b424..29b50637f4 100644 --- a/libavcodec/ffv1enc_template.c +++ b/libavcodec/ffv1enc_template.c @@ -46,7 +46,7 @@ RENAME(encode_line)(FFV1Context *f, } } - if (s->slice_coding_mode == 1) { + if (sc->slice_coding_mode == 1) { for (x = 0; x < w; x++) { int i; int v = sample[0][x]; @@ -178,10 +178,10 @@ static int RENAME(encode_rgb_frame)(FFV1Context *f, r = *((const uint16_t *)(src[2] + x*2 + stride[2]*y)); } - if (s->slice_coding_mode != 1) { + if (sc->slice_coding_mode != 1) { b -= g; r -= g; - g += (b * s->slice_rct_by_coef + r * s->slice_rct_ry_coef) >> 2; + g += (b * sc->slice_rct_by_coef + r * sc->slice_rct_ry_coef) >> 2; b += offset; r += offset; } @@ -195,10 +195,10 @@ static int RENAME(encode_rgb_frame)(FFV1Context *f, int ret; sample[p][0][-1] = sample[p][1][0 ]; sample[p][1][ w] = sample[p][1][w-1]; - if (lbd && s->slice_coding_mode == 0) + if (lbd && sc->slice_coding_mode == 0) ret = RENAME(encode_line)(f, s, sc, w, sample[p], (p + 1) / 2, 9); else - ret = RENAME(encode_line)(f, s, sc, w, sample[p], (p + 1) / 2, bits + (s->slice_coding_mode != 1)); + ret = RENAME(encode_line)(f, s, sc, w, sample[p], (p + 1) / 2, bits + (sc->slice_coding_mode != 1)); if (ret < 0) return ret; } -- 2.43.0 _______________________________________________ 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".