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 953D04F806 for ; Mon, 23 Jun 2025 13:39:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 9B9BB68E1E7; Mon, 23 Jun 2025 16:38:07 +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 B8ED868E11D for ; Mon, 23 Jun 2025 16:38:04 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2363497cc4dso36790805ad.1 for ; Mon, 23 Jun 2025 06:38:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750685883; x=1751290683; 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=oZPjqDKwI5ItWmAxiH/cnYTDtj+5qTs9kKEucGga2do=; b=KI8AVqAybP9/qDfx4v0ubR59Y56vgRXPrXH/dv9QXfFU8nt7/1ZGNKLQdtBLSIb3kE lpHHPWcW7rZUFFJ7jzIUD0uigeH/FzmtgMbm5xyvwVA7op+ftbDnkQhUJoMWbb1jpxXs pBi4gcxmpcceQy0FQ2aV86cHbAKRt2Y8dEHzbRgoKoIVoeTx9SHLeb2/lrl72Rm7H7wX KAe0FwnSJRqG7krs4umLX9le2GWlBnEB6N97rgXBcAZVLfBBaqRGLqQLNz4o9PZFStS+ KR0r3YyFVnCpRbrbI5Ta/60QxlOgxlGrbEPrfsR0CKDM4k8m+G4IUsDBiygm3kb2wck9 MVTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750685883; x=1751290683; 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=oZPjqDKwI5ItWmAxiH/cnYTDtj+5qTs9kKEucGga2do=; b=Nv+f0hwkA6/KE1SVwIQkw51N2cmkPgzOC3iNX54KWo3/i7eXNNQMyjeBG8DQC39UGj /Vty8AmXOIw2nFocJvvozTPLWWODz7Zwdl0Z/yCbn1m+JSfz2l240aLHtnCToyUMza1J /cr6n7/m4cu+Msif2u3rtHI5IVszxY7tc3djZYckf8YdNI/LPXDcsNltiV+rQwawwkLZ 8c7hmi11pmhJqwdBsr52QAdj5H/X90//uwgq0wBSCFHihuacTl3atekaJe7egsTUq9a/ HqxfoPUyZ1r1i0EQ202CnZ2UiylRPVO1nw0TWlmfidLxLiLxATzLx1MEdC8/IVOkHhn5 Cagw== X-Gm-Message-State: AOJu0YwRQzUMK715563X1N1A0ZCy3YEp+oLLkgwUexslXjSZwT3KciMg Xv1SVA8CUg69/mdVOEOOaZmRFRKG96rnqgzKxHcNz4OaNRdl/JzJpeYLqwJHsQ== X-Gm-Gg: ASbGncuBj+FpZ45+kKvqvBc2OdhrUtxiKKU4YP0B5kAm4ZRyYGdfs3sKYhr5UwQto68 TIjnX+HTxN3dQ5D1dQJ5eoh4aVJfzKr8g7apbDUkY/AMzGDzGukT/4AMgmnIcnf3EQq0RHYoGL5 fD3Ew0YHGzKoyvac6dCDLa5+FehDQA3+K/BhJZEjQZ1Ww6Uw5BN+0qfhaATgFsDkE97Cfbc5PNb IVH4wF9gych1Gb9ENfAXlEntRBO9sBYWO+Vpdc2k04rkUuCyXFKgCQwFR2R6ITSgaLTvsDbj8wY k5/T6VVBZEM0bR3fZwP/7hvewFoM/ekCFRfK6nn4/DQchaHX7OTjdfE3/U2IrCCukeo+pVVulX7 vN4FJrFt23a317DsA X-Google-Smtp-Source: AGHT+IFWYg92Zv4oYQJ8fhpD84WKrWbWyUWFzY0OnWmxWP317VDIHdCm9UG4w+JDP6PIcRtgdZXsLA== X-Received: by 2002:a17:903:1a2e:b0:223:4537:65b1 with SMTP id d9443c01a7336-237d9ab113emr190106665ad.36.1750685882875; Mon, 23 Jun 2025 06:38:02 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237d83f029csm86002355ad.76.2025.06.23.06.38.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2025 06:38:02 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <2349e93c7a542f0c3118e4af7c14facfff2ce294.1750685809.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 23 Jun 2025 13:36:12 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 12/48] avcodec/h261dec: 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 Instead put it into H261DecContext. This is in preparation for removing MpegEncContext.block. Signed-off-by: Andreas Rheinhardt --- libavcodec/h261dec.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 50fc375c26..e47bc00a71 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -25,6 +25,7 @@ * H.261 decoder. */ +#include "libavutil/mem_internal.h" #include "libavutil/thread.h" #include "avcodec.h" #include "codec_internal.h" @@ -62,6 +63,8 @@ typedef struct H261DecContext { int current_mv_y; int gob_number; int gob_start_code_skipped; // 1 if gob start code is already read before gob header is read + + DECLARE_ALIGNED_32(int16_t, block)[6][64]; } H261DecContext; static av_cold void h261_decode_init_static(void) @@ -213,7 +216,7 @@ static int h261_decode_mb_skipped(H261DecContext *h, int mba1, int mba2) s->cur_pic.motion_val[0][b_xy][1] = s->mv[0][0][1]; } - ff_mpv_reconstruct_mb(s, s->block); + ff_mpv_reconstruct_mb(s, h->block); } return 0; @@ -446,9 +449,9 @@ static int h261_decode_mb(H261DecContext *h) intra: /* decode each block */ if (s->mb_intra || HAS_CBP(com->mtype)) { - s->bdsp.clear_blocks(s->block[0]); + s->bdsp.clear_blocks(h->block[0]); for (i = 0; i < 6; i++) { - if (h261_decode_block(h, s->block[i], i, cbp & 32) < 0) + if (h261_decode_block(h, h->block[i], i, cbp & 32) < 0) return SLICE_ERROR; cbp += cbp; } @@ -457,7 +460,7 @@ intra: s->block_last_index[i] = -1; } - ff_mpv_reconstruct_mb(s, s->block); + ff_mpv_reconstruct_mb(s, h->block); return SLICE_OK; } -- 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".