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 89C2A4F806 for ; Mon, 23 Jun 2025 13:40:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3054A68E226; Mon, 23 Jun 2025 16:38:28 +0300 (EEST) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A813B68E1BE for ; Mon, 23 Jun 2025 16:38:26 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-748e63d4b05so2424320b3a.2 for ; Mon, 23 Jun 2025 06:38:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750685905; x=1751290705; 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=OXHXCABdXPQ8vTF1+72IMDy8QEc/oJLJwishQByPDFk=; b=dP389flL+QsHzL0KlkG8MlNK4Ekbc5Y2Z6d0MOEBcCC+HfOzmhwmKVM1p2L7fYd5rZ 0UT9ttUfhPCewkwEkjZy2ny3jHJnZR6v9vPu3a5J0yssRAMvg4SKhOACuONulpKjgPbg cSs4SRzuK/gXa4qX1Cv97esCNOpgv7wO5Ue3ASz+hYkLEOeexEdm3p7zRtjWdtNqmkpH I8ugGKx4RG40NrPublFgK4LFCMFV4eerpwP0HwXtKYVks8D7MCOgkA8FLBwfNHBQBwmF al3SMiJk4sEiN9Mw491DxHllCpj4WBz2av7S3fAPA5zVNmZNTgEK6tNL6RBa5Ene0ppN 989Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750685905; x=1751290705; 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=OXHXCABdXPQ8vTF1+72IMDy8QEc/oJLJwishQByPDFk=; b=alB/4UJCgwMFna0xFvaKmkaQ0EpAjcu22vhFDRBD+cCt/kUEt5A9PxNgEUApjT0unb 71aRPbSmg39f751lfkhHGtFalLK5YJaC0sEPlaJwYa5u7TzPoQFlDMo9yNbm9o7m+Acs Y3PU1rTRmKbnhKgvfL9vVOSQfAme+jFuwlFDPTXe9V6Sc/L55VAGlMx7QGGmyijXfCUS kBVcxHAv5y4J8Xwi8Ba+VPjifq/cXgLqIiOdxM5vSlovP9EQOUzikag0d3bJVqTN4shw BOwCVvpCMfYqXllFBSjkFLUrWeZc4KX0WiTNk9uP65USrXmSoJr6jM+7A1UPxxACYNJL iZEg== X-Gm-Message-State: AOJu0YyvMd9UJXanjl1EPvb9vYRzrXsFw7tTq0eICfXf4Vt68oKDxun9 nlUBD7rVi9E7THE3aODQGH0XLe1aqsUG/SYDaRfdtfva00aeanzTAvZNvQLULw== X-Gm-Gg: ASbGncvjI22E/n/+wTo80sWjRiE9BQM/zWPJruZV2NX7mRJHSNp1oRp8PJTbyi80jmM N9jYvTq+2d3RKXjTlzSlYRB9rDb+NT8m6uoEzcEUTSzbDgRma1GmDQkPKWBnPcs/l0MTi5g+LQE ecoMc0wdXHemof/H4zYE5rWiQDRXHHWczh9Ybr9D3iFTtGVoJEnyTQj35iaNvAsqQ3cTXuX+Nsp jknxX4nTbGkPFvSuMk/X8iHJ2Ae8+wPLv8k6lrmpd4L5oM2imLjfcdal15VMlChZ8d9zyrLTxih ximbs+x8KPrW5TGysIy3UBAw1s5S24BSarSc9gKrrj2rcXZtS342Hk6Bw3It7uWgUYpcGFKl2mM Q/Ii086lwKlJoQt1P X-Google-Smtp-Source: AGHT+IH0Ip9zh73j2Bv+9XDUQXL4anISWXHn5S2WrGI9JkfNQul/T8hNOI3rlWgendi+dfn02KEp0Q== X-Received: by 2002:a05:6a00:1a8c:b0:746:1e35:3307 with SMTP id d2e1a72fcca58-7490d6faa18mr17380647b3a.14.1750685904721; Mon, 23 Jun 2025 06:38:24 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7490a46b590sm8345509b3a.27.2025.06.23.06.38.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2025 06:38:24 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <12b9d47fd630cfb9c924a2baf9bddd3f15a23f39.1750685809.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 23 Jun 2025 13:36:16 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 16/48] avcodec/rv34: Don't use MpegEncContext.block 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 These decoders only need a single 4x4 block; put it in RV34DecContext. This is in preparation for removing MpegEncContext.block. Signed-off-by: Andreas Rheinhardt --- libavcodec/rv34.c | 7 +++---- libavcodec/rv34.h | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 73fd16b3e2..9f8a0f12b8 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1029,8 +1029,7 @@ static inline void rv34_process_block(RV34DecContext *r, uint8_t *pdst, int stride, int fc, int sc, int q_dc, int q_ac) { - MpegEncContext *s = &r->s; - int16_t *ptr = s->block[0]; + int16_t *const ptr = r->block; int has_ac = rv34_decode_block(ptr, &r->gb, r->cur_vlcs, fc, sc, q_dc, q_ac, q_ac); if(has_ac){ @@ -1049,7 +1048,7 @@ static void rv34_output_i16x16(RV34DecContext *r, int8_t *intra_types, int cbp) int q_dc = rv34_qscale_tab[ r->luma_dc_quant_i[s->qscale] ], q_ac = rv34_qscale_tab[s->qscale]; uint8_t *dst = s->dest[0]; - int16_t *ptr = s->block[0]; + int16_t *const ptr = r->block; int i, j, itype, has_ac; memset(block16, 0, 16 * sizeof(*block16)); @@ -1215,7 +1214,7 @@ static int rv34_decode_inter_macroblock(RV34DecContext *r, int8_t *intra_types) MpegEncContext *s = &r->s; GetBitContext *const gb = &r->gb; uint8_t *dst = s->dest[0]; - int16_t *ptr = s->block[0]; + int16_t *const ptr = r->block; int mb_pos = s->mb_x + s->mb_y * s->mb_stride; int cbp, cbp2; int q_dc, q_ac, has_ac; diff --git a/libavcodec/rv34.h b/libavcodec/rv34.h index 485a034f9e..5bed46ea4f 100644 --- a/libavcodec/rv34.h +++ b/libavcodec/rv34.h @@ -119,6 +119,7 @@ typedef struct RV34DecContext{ uint8_t *cbp_chroma; ///< CBP values for chroma subblocks uint16_t *deblock_coefs; ///< deblock coefficients for each macroblock + DECLARE_ALIGNED_16(int16_t, block)[16]; /** 8x8 block available flags (for MV prediction) */ DECLARE_ALIGNED(8, uint32_t, avail_cache)[3*4]; -- 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".