From patchwork Tue Jul 16 17:11:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FFmpeg Technical Committee X-Patchwork-Id: 50578 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:40f5:b0:482:c625:d099 with SMTP id lb53csp449941vqb; Tue, 16 Jul 2024 10:41:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUo2rgsqnwPXa7mFdVyzDcZTjszPCUNgb9LZmJlpzfPNmViO/TX/j0ZseNJpt4f6f+3cBMko0aQqkqul6bB/GgW5glpijZaNGLqgw== X-Google-Smtp-Source: AGHT+IHqsnWwMhr1KzDYNkWrXfD4Ev571Dj5obE7vQmbD1MPiyYsb+Nv9lDz6EkYr1xbLYoyBHS3 X-Received: by 2002:a2e:9d86:0:b0:2ee:4a67:3d82 with SMTP id 38308e7fff4ca-2eef4191defmr23763291fa.28.1721151710152; Tue, 16 Jul 2024 10:41:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721151710; cv=none; d=google.com; s=arc-20160816; b=xOK8/RhEhOA440sDNsydl8sTaBjOz/4q+3dx4GxN5rCNZvTee116hBXYaM5/K7QqTm 7dkASLoXGgvVsITnMfJEvS29xHNbRdf8v1DNEP2Be3QF/u8K6BdL5+2zJAAtx/15/mmy A4J14SDayRg34WxSMMHtONf5opcXkpI7nBjfBkXFoCyQ2CTKnwGD19o1y+NHj63btJrc 6rlLsQ9kmul26h8+QK0m/055/Gk5TomXROWnQKDKQivZ38l5CyReTRfQngRP9iz+H8DU +DvX3Rd7CrDyl1KDJ0gga6VVDyBRgEutEOFYQnO2Zq/2VRfm+OBrSmxkAhdrx4VwjojO WB0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=jhV+llu2e9QwW3+gnCNLVA0z6jYC4422L8fj1qHLH/Y=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=AD2lOByTZB3MIifh3PhRI+0gqH9gpR2RYjP0v72sXLK8qOiO5RqVkpdbpL+/fUY4wr vM9IvUxnK1Y83reZ8PppHfl16y38lhPnvNnSHaOOjAwv9Zn2kZhppKsx8aTBou9Ogt6O 2khxB2lRVB/9Qvtq3CNhS30+wTmREC95vosIhL39IFYRLwzcJANprZ7lDhofWm9iVL+/ yr55chKcOn6Bo4719oUUt8OSAjzZsGFvi8RWTGiI72zfnu9zbTck+2mXZx4tqftW5QNA RI5WitlpczXXOsQseNvCCHOj3qlUapEwUsUCg7ONMK9lEkQnEnPg2IVPGnIhp1QcEexF j9pg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=N2yp1KGB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2eee1972269si19676341fa.621.2024.07.16.10.41.49; Tue, 16 Jul 2024 10:41:50 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=N2yp1KGB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C04268DAE1; Tue, 16 Jul 2024 20:16:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2791F68DA81 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=N2yp1KGB; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 06A374DE1 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 xDKh33v9Q1uX for ; Tue, 16 Jul 2024 19:16:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1721150187; bh=1tsXoj3N2OFZstBLZxw+Qvz4TdpcQuylVzVGqBSXX3g=; h=From:To:Subject:Date:In-Reply-To:References:From; b=N2yp1KGBmODi+38pXKZbHaXxed0XsO+5+BmL12t5FaeCKBRD+pWrhLK/jmKS+ABP+ 2Tjyecxr4nsuhi1YsAuwZGTitq+FDAQ6rEDn371DhLEo+dkkexBtouTIYtyEksHWkF j22Z1NNNMMDwYGyyC4hmg5WfITe5iVTdC0exWkxe2GRPa+pYccsiOYo/7Qic+dfTrz tYiqFzaBgoH9JOiZ6PCv344pJQvO4ztBipcNNa1tKJVzPD0Fyy/pa5NrnO3kwyfOZg Ma3nH9HxW2efCG+0X4IKlErRbZK0JHC8V9TuBdwqx3MI9WCJF8EWLlzm5EyVzmfOl1 NbEu0ilSofdpA== 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 9231B4DF8 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 ECD9C3A2B5B 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:32 +0200 Message-ID: <20240716171155.31838-17-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 17/39] lavc/ffv1: always use the main context values of ac 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QyZunDDpNnOj It cannot change between slices. --- libavcodec/ffv1.c | 6 +++--- libavcodec/ffv1dec.c | 14 ++++++-------- libavcodec/ffv1dec_template.c | 6 +++--- libavcodec/ffv1enc.c | 6 +++--- libavcodec/ffv1enc_template.c | 4 ++-- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 06a77c3a26..581e775ae2 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -59,7 +59,7 @@ av_cold int ff_ffv1_init_slice_state(const FFV1Context *f, FFV1Context *fs) for (j = 0; j < f->plane_count; j++) { PlaneContext *const p = &fs->plane[j]; - if (fs->ac != AC_GOLOMB_RICE) { + if (f->ac != AC_GOLOMB_RICE) { if (!p->state) p->state = av_malloc_array(p->context_count, CONTEXT_SIZE * sizeof(uint8_t)); @@ -78,7 +78,7 @@ av_cold int ff_ffv1_init_slice_state(const FFV1Context *f, FFV1Context *fs) } } - if (fs->ac == AC_RANGE_CUSTOM_TAB) { + if (f->ac == AC_RANGE_CUSTOM_TAB) { //FIXME only redo if state_transition changed for (j = 1; j < 256; j++) { fs->c. one_state[ j] = f->state_transition[j]; @@ -167,7 +167,7 @@ void ff_ffv1_clear_slice_state(const FFV1Context *f, FFV1Context *fs) for (i = 0; i < f->plane_count; i++) { PlaneContext *p = &fs->plane[i]; - if (fs->ac != AC_GOLOMB_RICE) { + if (f->ac != AC_GOLOMB_RICE) { if (f->initial_states[p->quant_table_index]) { memcpy(p->state, f->initial_states[p->quant_table_index], CONTEXT_SIZE * p->context_count); diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 8464697fd3..133baa895a 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -94,10 +94,9 @@ static inline int get_vlc_symbol(GetBitContext *gb, VlcState *const state, return ret; } -static int is_input_end(FFV1Context *s, GetBitContext *gb) +static int is_input_end(RangeCoder *c, GetBitContext *gb, int ac) { - if (s->ac != AC_GOLOMB_RICE) { - RangeCoder *const c = &s->c; + if (ac != AC_GOLOMB_RICE) { if (c->overread > MAX_OVERREAD) return AVERROR_INVALIDDATA; } else { @@ -197,7 +196,7 @@ static int decode_slice_header(const FFV1Context *f, FFV1Context *fs, av_assert0 ( (unsigned)sc->slice_x + (uint64_t)sc->slice_width <= f->width && (unsigned)sc->slice_y + (uint64_t)sc->slice_height <= f->height); - if (fs->ac == AC_GOLOMB_RICE && sc->slice_width >= (1<<23)) + if (f->ac == AC_GOLOMB_RICE && sc->slice_width >= (1<<23)) return AVERROR_INVALIDDATA; for (unsigned i = 0; i < f->plane_count; i++) { @@ -284,7 +283,7 @@ static int decode_slice(AVCodecContext *c, void *arg) pdst->state = NULL; pdst->vlc_state = NULL; - if (fssrc->ac) { + if (f->ac) { pdst->state = av_malloc_array(CONTEXT_SIZE, psrc->context_count); memcpy(pdst->state, psrc->state, CONTEXT_SIZE * psrc->context_count); } else { @@ -319,7 +318,7 @@ static int decode_slice(AVCodecContext *c, void *arg) x = sc->slice_x; y = sc->slice_y; - if (fs->ac == AC_GOLOMB_RICE) { + if (f->ac == AC_GOLOMB_RICE) { if (f->version == 3 && f->micro_version > 1 || f->version > 3) get_rac(&fs->c, (uint8_t[]) { 129 }); fs->ac_byte_count = f->version > 2 || (!x && !y) ? fs->c.bytestream - fs->c.bytestream_start - 1 : 0; @@ -358,7 +357,7 @@ static int decode_slice(AVCodecContext *c, void *arg) p->data[3] + ps * x + y * p->linesize[3] }; decode_rgb_frame(f, fs, sc, &gb, planes, width, height, p->linesize); } - if (fs->ac != AC_GOLOMB_RICE && f->version > 2) { + if (f->ac != AC_GOLOMB_RICE && f->version > 2) { int v; get_rac(&fs->c, (uint8_t[]) { 129 }); v = fs->c.bytestream_end - fs->c.bytestream - 2 - 5*f->ec; @@ -791,7 +790,6 @@ static int read_header(FFV1Context *f) for (int j = 0; j < f->slice_count; j++) { FFV1Context *fs = f->slice_context[j]; FFV1SliceContext *sc = &f->slices[j]; - fs->ac = f->ac; fs->packed_at_lsb = f->packed_at_lsb; fs->slice_damaged = 0; diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c index 776dc4144f..30a13e0faf 100644 --- a/libavcodec/ffv1dec_template.c +++ b/libavcodec/ffv1dec_template.c @@ -35,7 +35,7 @@ RENAME(decode_line)(FFV1Context *f, int run_mode = 0; int run_index = sc->run_index; - if (is_input_end(s, gb)) + if (is_input_end(c, gb, f->ac)) return AVERROR_INVALIDDATA; if (sc->slice_coding_mode == 1) { @@ -55,7 +55,7 @@ RENAME(decode_line)(FFV1Context *f, int diff, context, sign; if (!(x & 1023)) { - if (is_input_end(s, gb)) + if (is_input_end(c, gb, f->ac)) return AVERROR_INVALIDDATA; } @@ -69,7 +69,7 @@ RENAME(decode_line)(FFV1Context *f, av_assert2(context < p->context_count); - if (s->ac != AC_GOLOMB_RICE) { + if (f->ac != AC_GOLOMB_RICE) { diff = get_symbol_inline(c, p->state[context], 1); } else { if (context == 0 && run_mode == 0) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index fb373b598b..7fb5b997cc 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -1053,7 +1053,7 @@ retry: if (f->version > 2) { encode_slice_header(f, fs, sc); } - if (fs->ac == AC_GOLOMB_RICE) { + if (f->ac == AC_GOLOMB_RICE) { fs->ac_byte_count = f->version > 2 || (!x && !y) ? ff_rac_terminate(&fs->c, f->version > 2) : 0; init_put_bits(&sc->pb, fs->c.bytestream_start + fs->ac_byte_count, @@ -1085,7 +1085,7 @@ retry: if (ret < 0) { av_assert0(sc->slice_coding_mode == 0); - if (fs->version < 4 || !fs->ac) { + if (fs->version < 4 || !f->ac) { av_log(c, AV_LOG_ERROR, "Buffer too small\n"); return ret; } @@ -1210,7 +1210,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, FFV1SliceContext *sc = &f->slices[i]; int bytes; - if (fs->ac != AC_GOLOMB_RICE) { + if (f->ac != AC_GOLOMB_RICE) { bytes = ff_rac_terminate(&fs->c, 1); } else { flush_put_bits(&sc->pb); // FIXME: nicer padding diff --git a/libavcodec/ffv1enc_template.c b/libavcodec/ffv1enc_template.c index 29b50637f4..970c185e93 100644 --- a/libavcodec/ffv1enc_template.c +++ b/libavcodec/ffv1enc_template.c @@ -34,7 +34,7 @@ RENAME(encode_line)(FFV1Context *f, int run_count = 0; int run_mode = 0; - if (s->ac != AC_GOLOMB_RICE) { + if (f->ac != AC_GOLOMB_RICE) { if (c->bytestream_end - c->bytestream < w * 35) { av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); return AVERROR_INVALIDDATA; @@ -72,7 +72,7 @@ RENAME(encode_line)(FFV1Context *f, diff = fold(diff, bits); - if (s->ac != AC_GOLOMB_RICE) { + if (f->ac != AC_GOLOMB_RICE) { if (s->flags & AV_CODEC_FLAG_PASS1) { put_symbol_inline(c, p->state[context], diff, 1, s->rc_stat, s->rc_stat2[p->quant_table_index][context]);