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 779C54F163 for ; Sun, 15 Jun 2025 17:01:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id F2D4C68D916; Sun, 15 Jun 2025 19:57:44 +0300 (EEST) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 10DA568D8E4 for ; Sun, 15 Jun 2025 19:57:43 +0300 (EEST) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-b2c41acd479so2246585a12.2 for ; Sun, 15 Jun 2025 09:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750006662; x=1750611462; 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=tIywO0x1Eyq/x6ip94L8dibrNWALsGAKMGemrYkQZdo=; b=fDHEw9l4YCIqWhTQ92/t/voH1vHv8zmZc5RIcZgiWC3+Qf46V3PZDnReb61v6kXSR/ bYlNUeJBrQDB1gzCFcKBG8vY8A8AlVXfvAPICDFa9w/8F+prwCvHaahOtuDSgLx49pHF MZgmQb0cYEtBwIA6ggsUVV/tsKPOEpE77GMwIWa2s8HPHeD73gDMHrxneIKA+65UbNyw W0pq870M/ape/hZyF2TgYYfyu0tQz1z10VtXWpb6zve/7yUOrwX62s9ZQpzj+i2/wRbt dfpTQNvPPjle7cCrGGebNWnHzAezxnf7rDkYeGhWMoohrJO/MXxzYo3Ztq+NeW04U3UM Drlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750006662; x=1750611462; 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=tIywO0x1Eyq/x6ip94L8dibrNWALsGAKMGemrYkQZdo=; b=FK3o59WVZJ7mIrohsbBGq5KTjHYMaTidQqd3ygdYihnMba4V/F8GB1PoFdkG4bcYPy xIKY1yoABON87wfclTMt/15Ld60x1q9ZNclD0VfC8fgPG0KF6IWC82EN5eefdSP7Ip8H bESdxhA9kpWJJxFnAbQ92My/GA9gaqNt7ksnXqMYmstWPVaCIVtb7Q196HMeivq9lll3 8mXBfeCAIwugzkWw/QUlvWab6qPO0oUu2EpEpAza3qBgeWLIKHLy4Ol8ReBqTQ/in+bO QZYq1ARBF62KGxREIgojSwZ5i4ONsFx3Eljt5T/HErpEXsao7BsNfV/EvnwLL7AyNxCX lF8g== X-Gm-Message-State: AOJu0Yx4mv4ECcr+f8LqaVfyGk+tH77pev1SLpg6roVl6tz64/v6dFI+ hCZRsrUg9GErFZvk6/VfHMr9db1N3k+J7rUIbTgAPUyb1OWHOUmrbYSDeCIgSg== X-Gm-Gg: ASbGncvOWCs5kYM+J/ueeVQn0j3b2UPjNnYU4vCT3WBZ3tywUidKleJ8wOTHuFmgyMU u5/eXBkwr82m52BzqV9COsGQvQcBzuKVpnzW0454NBQeM4FwCsWjRyP0RIfAbfLO7imbV7I0uWs ipaBOOJzHXAepzuRlopSAiRMddExPR3xCbd69js1UXRjOB1zeKWyQdq3A5aeyjNwUtprtXiK4KD 8eZV0ebccAwghZ8O96O14PsnmhqFmYD+yC1ZfcFKtkVtCTPKGoXdkkJ3hT3AwSgI1Vzz6qydQmW G1ck7EkRYc7m7wW1VUR70usHyhEX3ABqTuen1fGcodPiMVO/pi59j9yhX+/6TKxAjULC+6T9BfZ n7imA49g4C4PGYmB0 X-Google-Smtp-Source: AGHT+IFvSs7yfC/woFUSK5uFbH+H+IQp5NKVGfl+Vly2SQQC1SKheQmO6fB+FaUSRlzQ6j/3EMhoNQ== X-Received: by 2002:a05:6a21:920a:b0:21f:31d9:593b with SMTP id adf61e73a8af0-21fbd7ff273mr9729004637.37.1750006662306; Sun, 15 Jun 2025 09:57:42 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b319467bd41sm1838328a12.24.2025.06.15.09.57.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Jun 2025 09:57:41 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <8917324de9e81894312a310c5f3abf4507e617d5.1750006480.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sun, 15 Jun 2025 16:54:22 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 31/47] avcodec/mpegvideo: Redo resetting intra table entry 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 All callers check the corresponding entry of MpegEncContext.mbintra_table and if set (indicating that the intra tables might have been written to when decodeing a intra MB, so that they are "dirty"), call ff_clean_intra_table_entries(), which resets them to default values and resets the mbintra_table entry. Move resetting to the callers (via an inline function that also performs the checks). This currently has the advantage that the additional load of the mbintra_table ptr can be avoided. It will also allow to simplify ff_clean_intra_table_entries() (by using block_index[4] and [5]). Signed-off-by: Andreas Rheinhardt --- libavcodec/h263.h | 8 ++++++++ libavcodec/h263dec.c | 3 +-- libavcodec/mpeg4videodec.c | 6 ++---- libavcodec/mpegvideo.c | 2 -- libavcodec/mpegvideo_enc.c | 7 +++++-- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/libavcodec/h263.h b/libavcodec/h263.h index 59f937070e..2fee0df4cd 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -44,4 +44,12 @@ void ff_h263_init_rl_inter(void); void ff_h263_update_motion_val(MpegEncContext * s); void ff_h263_loop_filter(MpegEncContext * s); +static inline void ff_h263_clean_intra_table_entries(MpegEncContext *s, int xy) +{ + if (s->mbintra_table[xy]) { + s->mbintra_table[xy] = 0; + ff_clean_intra_table_entries(s); + } +} + #endif /* AVCODEC_H263_H */ diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 37abf3382e..52b17663db 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -260,8 +260,7 @@ static int decode_slice(MpegEncContext *s) if (s->h263_pred || s->h263_aic) { int mb_xy = s->mb_y * s->mb_stride + s->mb_x; if (!s->mb_intra) { - if (s->mbintra_table[mb_xy]) - ff_clean_intra_table_entries(s); + ff_h263_clean_intra_table_entries(s, mb_xy); } else s->mbintra_table[mb_xy] = 1; } diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 32b2dec1d6..1294138d05 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1073,8 +1073,7 @@ try_again: mot_val[1 + stride] = mot_val[3 + stride] = my; - if (s->mbintra_table[xy]) - ff_clean_intra_table_entries(s); + ff_h263_clean_intra_table_entries(s, xy); continue; } @@ -1103,8 +1102,7 @@ try_again: mot_val[1 + stride] = mot_val[3 + stride] = 0; } else { - if (s->mbintra_table[xy]) - ff_clean_intra_table_entries(s); + ff_h263_clean_intra_table_entries(s, xy); if (s->pict_type == AV_PICTURE_TYPE_S && ctx->vol_sprite_usage == GMC_SPRITE && diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f6e997193d..b8f0957ec5 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -508,8 +508,6 @@ void ff_clean_intra_table_entries(MpegEncContext *s) /* ac pred */ memset(s->ac_val[1][xy], 0, 16 * sizeof(int16_t)); memset(s->ac_val[2][xy], 0, 16 * sizeof(int16_t)); - - s->mbintra_table[xy]= 0; } void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 60abe08d7a..04cebee9c6 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3559,8 +3559,11 @@ static int encode_thread(AVCodecContext *c, void *arg){ if (s->c.mb_intra /* && I,P,S_TYPE */) { s->p_mv_table[xy][0]=0; s->p_mv_table[xy][1]=0; - } else if ((s->c.h263_pred || s->c.h263_aic) && s->c.mbintra_table[xy]) - ff_clean_intra_table_entries(&s->c); +#if CONFIG_H263_ENCODER + } else if (s->c.h263_pred || s->c.h263_aic) { + ff_h263_clean_intra_table_entries(&s->c, xy); +#endif + } if (s->c.avctx->flags & AV_CODEC_FLAG_PSNR) { int w= 16; -- 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".