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 75BAC4F1EC for ; Sun, 15 Jun 2025 17:02:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 635AD68D982; Sun, 15 Jun 2025 19:58:15 +0300 (EEST) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id DB6AE68D974 for ; Sun, 15 Jun 2025 19:58:12 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-235e1d4cba0so32896545ad.2 for ; Sun, 15 Jun 2025 09:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750006691; x=1750611491; 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=OmAJWA6c+1bE5MIkWrLLIJecJf4XvrJH7GKIz2y1mpA=; b=VlXd1jo9K1fede+xwtavpsqf5xUkJYb6ut5j8zbBWae3hXW69ExtfLkMyANt7sJAtJ CE4CXrb5/SqgFJJWBnPNAdgesGox32g7KMp+rQC70HaG3uwtsmizWV/dzpeHq2i0eCj6 xDk0TJ6u8bkeDJ1/RJ9YxTTTj+Rk4gDFsK6x5uOEexcwpZ5tY3AcJAPc6p57I9Tdv8vy U4xgu14EGxWK0+c8jUpl4ONODZdKkRC+Z+qCb/LYqxlJgBjdwszBQR0oSNqqXZp0ecod ptrUd/2NS05fDj+Jq1rp7y9js3hYvTQ9iNMTQPdOF5ufEr13ljj65ivMHhjKDtghYNSI EgIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750006691; x=1750611491; 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=OmAJWA6c+1bE5MIkWrLLIJecJf4XvrJH7GKIz2y1mpA=; b=q4y+9U29ebdUlFSax+DONY8VXPUrKa1tvoS8fQEARgQnSo8D4wzGuFfu6CCn8eG1gE ciC5EizGU/Banojq5HrTCCVfd1NnG/qGNT6UZkKBLxVx1288wjR+S7xYlu5Nj5swjGWL rAYr/cB4nyTuud1P6/kpPcgOCeVWJFD6DhKAAq9p2g/4I+JUjoKoog0qbQ6KEeDob+TF I6mTW5wEhmleAnL6RrKHzC3M0vNJBr0JaExA3enPk16DsGuDdkwh8ECRlTplJK47RUXj 5gSIIq4J0OKvivkTGF0Y8m7XQO8bblccJa44MbpP8YpsP+RxBdkxMG2sbMEeOWKRcDa/ PO1w== X-Gm-Message-State: AOJu0YxL71k9l649FubS+m7xBL5D0JRRuEkyfX93BD/fR26ONgMI3hWW POK8qEvUKfOjL41BJmKQg0Vhth7R4WGICz0R4Px30Jjcz2ppT14k6OpE1sFSUg== X-Gm-Gg: ASbGncu+dmfsDuv1VvvnvBehgjLhLQA2rBrxWWGF/gJBJVjvOlZ31wLaJiAQ/V1Vmzl v7J8WatiA2yX17rtkNb5eVGAF36jeBIwMNmXKLjh6+q9uqZakoTemzky52frzqWK+yYMhBdmG8z MAJQXXDEe2mOCkVJeyaurZbxNQJ7wMBGf1LVBgPGMhGp8CL0m/V6usPSJ13g6exL/L1YUDXUpqS 4pn7uvxTXsVP/p/qvtsaJnfDmpuucTLEBA/itbqoLEtglQMpcyzMUaIUx2Cww9BZqptUQ+v7X9P qiRDcrpdjzXQR3kfeslGe5Gy5Kk3NuHWpQUpzAVj2nAj5eH2L2RkJ1f9C8V8rXnEeDUdjQmsuFH StsBbWRjUh6eEpAM8 X-Google-Smtp-Source: AGHT+IG4iyKpvT3pZ/QIFHSiVoWx3Cb2ZG5dxIDUCfWTaqZ4zlnKKGQhdtXzkVv67HMZvqD9txPp9A== X-Received: by 2002:a17:903:22c8:b0:235:e942:cb9e with SMTP id d9443c01a7336-2366afe993amr95070835ad.9.1750006691116; Sun, 15 Jun 2025 09:58:11 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2365d8a19d7sm46132805ad.83.2025.06.15.09.58.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Jun 2025 09:58:10 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <9dfb602f1fb3336c955cc1b804d84d353ee9ec8d.1750006480.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sun, 15 Jun 2025 16:54:27 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 36/47] avcodec/mpeg4video: Don't use ac_val[1], ac_val[2] when cleaning buffers 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 This is in preparation for removing removing ac_val[1] and ac_val[2]. ff_mpeg4_clean_buffers() was the last user of them. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4video.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpeg4video.c b/libavcodec/mpeg4video.c index 3980a39305..a690077c58 100644 --- a/libavcodec/mpeg4video.c +++ b/libavcodec/mpeg4video.c @@ -43,17 +43,18 @@ int ff_mpeg4_get_video_packet_prefix_length(enum AVPictureType pict_type, void ff_mpeg4_clean_buffers(MpegEncContext *s) { - int c_wrap, c_xy, l_wrap, l_xy; + const int mb_height = s->mb_height; + int c_wrap, l_wrap, l_xy; l_wrap = s->b8_stride; l_xy = (2 * s->mb_y - 1) * l_wrap + s->mb_x * 2 - 1; c_wrap = s->mb_stride; - c_xy = (s->mb_y - 1) * c_wrap + s->mb_x - 1; + int u_xy = 2 * mb_height * l_wrap + s->mb_y * c_wrap + s->mb_x - 1; /* clean AC */ memset(s->ac_val[0] + l_xy, 0, (l_wrap * 2 + 1) * 16 * sizeof(int16_t)); - memset(s->ac_val[1] + c_xy, 0, (c_wrap + 1) * 16 * sizeof(int16_t)); - memset(s->ac_val[2] + c_xy, 0, (c_wrap + 1) * 16 * sizeof(int16_t)); + memset(s->ac_val[0] + u_xy, 0, (c_wrap + 1) * 16 * sizeof(int16_t)); + memset(s->ac_val[0] + u_xy + c_wrap * (mb_height + 1), 0, (c_wrap + 1) * 16 * sizeof(int16_t)); /* clean MV */ // we can't clear the MVs as they might be needed by a B-frame -- 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".