From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 4159E4F7EF for ; Mon, 23 Jun 2025 13:40:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 4753468E236; Mon, 23 Jun 2025 16:38:33 +0300 (EEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 2C05768E21C for ; Mon, 23 Jun 2025 16:38:32 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-236192f8770so29180565ad.0 for ; Mon, 23 Jun 2025 06:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750685910; x=1751290710; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=mJ8JoqWLih5+LfrUhg2Rc7V0tE6vJmf7L16fctYjvMA=; b=RaX7GhVkoBOABm/iRhCS4BcdzlUIvHJpmU48bCcGnyIitu2pi2h/T6UTCQmZ5DXl8v 2XYG3NhrBtX/ggdRvQ+0WTpyA6ybdAQ3ZrufxXTl1ovFc/k+uiKp2t413ONW176YzWZu Vl/zZMtbLmMyZq+RzOoMaw7m5C/f/kpJzsgFXdfWfwJ8JpWdYTcr6YKR1LtaZf4Kq2NC duQKNkRDNosdA4FpXon/a9a4kQBS4/MrXW4Iv60Zdan1A9Z9HY/uvouNI3aEHkS0uQQ6 oYFTp/RqHUeoADVMQ+AVhwrwwFDc0BOkjyEtRPm2kr0gpgP9y25zkY1IMxnvmS4atnzF rKfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750685910; x=1751290710; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=mJ8JoqWLih5+LfrUhg2Rc7V0tE6vJmf7L16fctYjvMA=; b=j73JW7hP7R1boPBhvwlHwacyCiLOkxAK+IoFZ8ctBpn++SkplnDAhf7fHnhmTBZAZi s6+k9pT9WAY/Zv2jbfnDF9jD23HRwAH2kXSzpRGIqhQF+gIO15rkriigq9qBokpk/ndS KWsMOjahFm+PJv/mvzaaCGanBPOhLgSLYAzHx14f0caH8vbkVOR+DOoxhVlZO/koRqmX 6G+VBhUXA9/PIpDBGwPHIvpPelLcly0VTftsQ1ShJPNHhSpihRTZYPcXRuBtOFzZBNEE DJ9VIQXDvX9wv2zl3bflmtknR6k87e5PMKHQSvNaWWJMyrHEcpsjHMyMGkYeFUYS5hJd 2dhQ== X-Gm-Message-State: AOJu0YxS9T4dt0qM8Fh7X0DJXVdoXOlU0HlLUKYk2SLv7Ji0sL52U2im cDuoZcUCd3+XqUygFvAOexI/Hb7amtX0ne61WTQnoJNAXNf79wrZWlHXpVVidA== X-Gm-Gg: ASbGncsDrD18srGgLVFPEv8EJu9y69hjigBWIGAd+Hc8ttpJeray38FMYnWrWvSZNlu x6O70Su3qUWakkFYJdjgSi17c8plCKqeOQRap6NmVOClS+Ju1bmd/wy+b6CfT4mfVjSeR43+d9C fbY1OS3eOA3bqYXpkTEKYlGEy4kAdOnx9b0P7v/CmzMnlGmZ+wr4yURBkimRFIU1SlwzajRrJdL 43NlW3U5MXgYlOjP0NyDTZomBB0ZCngOJ7YQ/zsswZwwDGKdOdijg/mwgv/Sl7KURLuAn4j7TtQ CB3a9IsIrVCfnnEuCJScwRd/lIr4O/u+H1jM/UwdV9t10I+y3Q1dElqsjGm3XE3hFMWlItJvNUU moyHOf4Gi8vYUCoDh X-Google-Smtp-Source: AGHT+IGb9nUn3ArXE+WS2S48rRI8pVwCIvsNhYu6zUFFL3FQttwbz5vMYt4PHSfEMW+sx1yOFHC8Vg== X-Received: by 2002:a17:903:17c5:b0:235:f091:11e5 with SMTP id d9443c01a7336-237dafd1a49mr195174095ad.10.1750685910300; Mon, 23 Jun 2025 06:38:30 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237ee7035e7sm44452855ad.186.2025.06.23.06.38.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2025 06:38:30 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: In-Reply-To: References: Date: Mon, 23 Jun 2025 13:36:17 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 17/48] avcodec/intrax8: Don't pretend to need more than one int16_t[64] 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 Cc: Andreas Rheinhardt 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: From: Andreas Rheinhardt Intrax8 needs only a single block. Signed-off-by: Andreas Rheinhardt --- libavcodec/intrax8.c | 16 ++++++++-------- libavcodec/intrax8.h | 4 ++-- libavcodec/vc1dec.c | 2 +- libavcodec/wmv2dec.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 684f15d904..89b70e5902 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -437,7 +437,7 @@ static void x8_ac_compensation(IntraX8Context *const w, const int direction, const int dc_level) { int t; -#define B(x,y) w->block[0][w->idct_permutation[(x) + (y) * 8]] +#define B(x,y) w->block[w->idct_permutation[(x) + (y) * 8]] #define T(x) ((x) * dc_level + 0x8000) >> 16; switch (direction) { case 0: @@ -530,7 +530,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) int sign; av_assert2(w->orient < 12); - w->bdsp.clear_block(w->block[0]); + w->bdsp.clear_block(w->block); if (chroma) dc_mode = 2; @@ -591,7 +591,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) if (use_quant_matrix) level = (level * quant_table[pos]) >> 8; - w->block[0][scantable[pos]] = level; + w->block[scantable[pos]] = level; } while (!final); } else { // DC only if (w->flat_dc && ((unsigned) (dc_level + 1)) < 3) { // [-1; 1] @@ -613,9 +613,9 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) zeros_only = dc_level == 0; } if (!chroma) - w->block[0][0] = dc_level * w->quant; + w->block[0] = dc_level * w->quant; else - w->block[0][0] = dc_level * w->quant_dc_chroma; + w->block[0] = dc_level * w->quant_dc_chroma; // there is !zero_only check in the original, but dc_level check is enough if ((unsigned int) (dc_level + 1) >= 3 && (w->edges & 3) != 3) { @@ -624,7 +624,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) * -> 01'10' 10'10' 00'00' 00'01' 01'11' 11'00 => 0x6A017C */ direction = (0x6A017C >> (w->orient * 2)) & 3; if (direction != 3) { - x8_ac_compensation(w, direction, w->block[0][0]); + x8_ac_compensation(w, direction, w->block[0]); } } @@ -639,7 +639,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) if (!zeros_only) w->wdsp.idct_add(w->dest[chroma], w->frame->linesize[!!chroma], - w->block[0]); + w->block); block_placed: if (!chroma) @@ -678,7 +678,7 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame) av_cold int ff_intrax8_common_init(AVCodecContext *avctx, IntraX8Context *w, - int16_t (*block)[64], + int16_t block[64], int mb_width, int mb_height) { static AVOnce init_static_once = AV_ONCE_INIT; diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index 38ad09c837..2ec90963a8 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -38,7 +38,7 @@ typedef struct IntraX8Context { WMV2DSPContext wdsp; uint8_t idct_permutation[64]; AVCodecContext *avctx; - int16_t (*block)[64]; + int16_t *block; // set by the caller codec IntraX8DSPContext dsp; @@ -82,7 +82,7 @@ typedef struct IntraX8Context { */ int ff_intrax8_common_init(AVCodecContext *avctx, IntraX8Context *w, - int16_t (*block)[64], + int16_t block[64], int mb_width, int mb_height); /** diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 97174d10e3..8bcc7c60df 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -420,7 +420,7 @@ static av_cold int vc1_decode_init_alloc_tables(VC1Context *v) return AVERROR(ENOMEM); } - ret = ff_intrax8_common_init(s->avctx, &v->x8, s->block, + ret = ff_intrax8_common_init(s->avctx, &v->x8, s->block[0], s->mb_width, s->mb_height); if (ret < 0) return ret; diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 964d6a4c06..301c786633 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -581,7 +581,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) decode_ext_header(w); - return ff_intrax8_common_init(avctx, &w->x8, s->block, + return ff_intrax8_common_init(avctx, &w->x8, s->block[0], s->mb_width, s->mb_height); } -- ffmpeg-codebot _______________________________________________ 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".