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 9827B4F7EF for ; Mon, 23 Jun 2025 13:38:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id BDE2568E180; Mon, 23 Jun 2025 16:37:49 +0300 (EEST) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 5367468DF3A for ; Mon, 23 Jun 2025 16:37:48 +0300 (EEST) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-b3226307787so426707a12.1 for ; Mon, 23 Jun 2025 06:37:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750685866; x=1751290666; 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=TUWhLoRstMOi2a2ka2TPE2C17xlX1odinqjcNl8Q9As=; b=i/kmR3jhh8a7ii6sbMlpNNYcnOAEUBa3daXJTh3q9q/XVAe96aLPRXEKlv9XD7V+GE L8CnJDatg+ea2WjQW43WMFCkRcbVkV610Z7JQcmHYGmF69E0Pty5Sv9n+rqp+cla/yyj uIQHnN/kR8UGmBkaMzK/HQiLYrBDzRoqebwNKofImtebgEl4/WRbxzUePQA9kmwFIp4j HgscrrKyP0Ry/1jXmzOgsAlOe64ZTVj5Tn39sAJ/bjSpqqJM8R0tmcb4ur3hs9w+ByLD qda0toHFNlj8vLGRl8CK25moLM2VC/mBw7+iqNhQqK0Aiu1ts/ErF9f79TAvLoEIAvDd NiIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750685866; x=1751290666; 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=TUWhLoRstMOi2a2ka2TPE2C17xlX1odinqjcNl8Q9As=; b=NZQSfWEryuc8hjITHzGcyN6QzW5JRa6zMyg0BuqqXmJxDbiL1IRJVdzc07mfopivY8 o1nsPB/xZWoJprepxb59Q9U8qm/MvHopVbTzvxniU45bEy9c6gnlK3sF2EY0MeyfAQPe FFdZwQ8ZTkJ/y6r8/WxYfJ+i0YFQOzdYoRXavBIF1UKeeXHgmLgogjco9b04yTtVSzTs ejqPuheuuYfB0rX3HKl3uRSCcintXm1KSwIf4svOr7AlfMqWaiiNh/pEElR3LMw43bKH Mwv7gSx41L9pfMygF2+wnaUEhpOr97Bkr0Emokhv0+8QXq6O1Qvn2mi18VS0dkIyEuNg CwIg== X-Gm-Message-State: AOJu0Yy5N8M78IKC2i+3zhMphKU0oMio8aCEy83L84PZpRPDZ/TTTONj awmcE2uuRGiJF556MmA0A5ERqyqfTR8/GflTMiePpVslTZl5IPJNykglGDBqbw== X-Gm-Gg: ASbGncsW4wZ3UJTr0P4p1NztWU+YveK/gescUq85bTmLOQFTRjHMUAq5UbV+FzE5Urw 2B7qUQGEsksW0tsONqneTwg1ppoabHL1tbuM6shU5vCxe/txmMbeu3LSR3e5zTlO1L+0iaA5jie iRj/gwLlt+fHdlZtqsN04qdmDLNrxGvbAug7c7R+fhY2wAYAxHVOOvOzE37MDqENL6ME052zfrr F+Y9mTniVjH4wZzL9LJsC7MmexewCp3LqKSfHUrDp3/Cs0c5x4oNwO6DdfXzcvYoGjtVg09q7y6 tmGBViYbfhTTo2/2adG/Lwtmm1KFWq+RxJhjQEV05q/aH3OkDUxPYHMairFJH99KX/JqyKznkSe +KeUT8zgvp/GEEJQv X-Google-Smtp-Source: AGHT+IEjiEwQaXhDdk2rcxRh83/MUdeuMzmqfrnFMHuq0a9Nqh8sYcCOlF8m2dFZe4s+/ERpeTLDKA== X-Received: by 2002:a05:6a20:3c8e:b0:204:432e:5fa4 with SMTP id adf61e73a8af0-22026eb16ddmr18485185637.23.1750685866349; Mon, 23 Jun 2025 06:37:46 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7490a49e9cbsm8770275b3a.57.2025.06.23.06.37.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2025 06:37:46 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <9493e2c706670819567d13fd97bcdd9ec70316eb.1750685809.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 23 Jun 2025 13:36:09 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 09/48] avcodec/mpeg_er: 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 It is unused (because unquantizing/the idct has been disabled) apart from FF_DEBUG_DCT_COEFF debug code which makes no sense when this function is called via error resilience. So pass a NULL as block when calling ff_mpv_reconstruct_mb() from mpeg_er_decode_mb() and disable the debug code in this scenario. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg_er.c | 4 ++-- libavcodec/mpegvideo_dec.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpeg_er.c b/libavcodec/mpeg_er.c index 6ac3e7b3e7..951167a478 100644 --- a/libavcodec/mpeg_er.c +++ b/libavcodec/mpeg_er.c @@ -76,7 +76,7 @@ static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, s->mcsel = 0; memcpy(s->mv, mv, sizeof(*mv)); - // The following disables the IDCT. + // The following disables unquantizing and the IDCT. for (size_t i = 0; i < FF_ARRAY_ELEMS(s->block_last_index); i++) s->block_last_index[i] = -1; @@ -93,7 +93,7 @@ static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, if (ref) av_log(s->avctx, AV_LOG_DEBUG, "Interlaced error concealment is not fully implemented\n"); - ff_mpv_reconstruct_mb(s, s->block); + ff_mpv_reconstruct_mb(s, NULL); } av_cold int ff_mpeg_er_init(MpegEncContext *s) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 903d435e8c..928464d6c1 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -1066,6 +1066,9 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], static av_cold void debug_dct_coeffs(MPVContext *s, const int16_t block[][64]) { + if (!block) // happens when called via error resilience + return; + void *const logctx = s->avctx; const uint8_t *const idct_permutation = s->idsp.idct_permutation; -- 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".