From patchwork Mon Jul 1 12:16:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 50247 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1739450vqv; Mon, 1 Jul 2024 05:17:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXz0EwKBHpKAPrMARlWMSsahuHkKVwsL3So0dZoKG5aeigNYO2UGZFy2R2VohdyGV3GD2IqHtgaxuyxqCJLDOZZ4mUWe2C8zznxsQ== X-Google-Smtp-Source: AGHT+IFE5q0oKK5N7CF3tGrAbssOsLmfbada/PAEY1pM+443zlzQvrKKbsKIiICkUwgK3FmKrFcf X-Received: by 2002:a17:907:72c2:b0:a69:13a2:4f6e with SMTP id a640c23a62f3a-a7514512d6fmr420924066b.74.1719836257298; Mon, 01 Jul 2024 05:17:37 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a72aaef5f07si349188266b.175.2024.07.01.05.17.36; Mon, 01 Jul 2024 05:17:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=fHrvaBRr; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4850B68D6B4; Mon, 1 Jul 2024 15:17:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2029.outbound.protection.outlook.com [40.92.50.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E46768D34E for ; Mon, 1 Jul 2024 15:17:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j7Bu56oLDnFMhpq3smA1MDlTp9kDesEFa/jM4GFCCxzm4Q+uadkDpoCA7OoaOGfZ/gCGFgFvalM5mU/AD2EPzVIW6PN2U+RzUNJO1itks9rXr+aAgdkg4riAK02Sv3HL74Nm2XaM0MGSvkuITtt95hR+4qSDtagrl2F55tgJlk68Gbzql9/OZpTFqdSKxaQ5nwS2A8rC0hkjH26PjYBx2rP5ou2j29hUjAqr0vUZJeUFtmKDhlx8aEKGLm8ZHD6s1QgtkQhNRoBPB4C55VDKZUUnqufT+F/l21s6ENh65/lIHBRX0fx3qFGyxZiD57SrIo/ASx+LaCBJJ0m2PbQb6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Y46LnJBRJkM3aIR1XFThIB3f0rluu4L6f+nyJ5JLiBo=; b=dWR6rYOSnEGhtpHfwgA/dHG9qXrd5v5twsQySH3iTWayk+vz2cQr3rPiaV9FMBe3iB9176OFqGlTZEPE5+E4dHmNugtWNmUXfV5yIaxWJXzIroeCXGXclfOrEGd+CZLmF4wvvSRJDtcFRJf2Op/2Iso4dmsQxED9ixAAK+Pl9OSd6rMf0y7Kjl/zyh8XVG7hE9hSFBeAxvoqDIXnxzWY6lec5BS9jZlo7WVGMv9xb69b+LEnBRWsxWtAhldenIchrur9Xstm5FOcy9lcIStP4uHX854WFSjjiaFEGu9ZvWkX735xwaZ306Z9WNrb/Z6DdxQxpj00MV8yVawn1sUqnQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Y46LnJBRJkM3aIR1XFThIB3f0rluu4L6f+nyJ5JLiBo=; b=fHrvaBRrzqc/cr3ffoPHtcir12TTjQox/dHHT5xWS3WjTE2ghscI+WQS99e4bpON4UHIDKjIlqtXPhu+TT+dzGRBCN7I34SFzlKS+AXksoNFAxW351t2UOhmHOJ9U1NiQG4IxXYPkj6BcoWE/a7mSyw3oVNpax3D+7if/l4Z9ELdyDtNZgEmOruA+9YWQ23O4JtnP3LdLuIPtxN5U8ROinGQpcLUjsr/G8xyWDM5LyIti5X1FspCLLxZhvvramXpnwuXon4JzkHeUBZFXM5bVZrnMyA8phKcEphjcyGbiR/iN+wm5ZKlKX+co0cOBiN2uFIBEcMfkyxLFkHHAYsW1A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0481.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:349::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.32; Mon, 1 Jul 2024 12:17:18 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%5]) with mapi id 15.20.7719.029; Mon, 1 Jul 2024 12:17:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jul 2024 14:16:02 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [LDlyp7v56s45DrTIi770pqRzghdUaf6BRuwk6tRfUJM=] X-ClientProxiedBy: ZR0P278CA0149.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::11) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240701121610.3560848-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0481:EE_ X-MS-Office365-Filtering-Correlation-Id: 1bfd1ebd-90e0-4ff2-3e6b-08dc99c7c02d X-Microsoft-Antispam: BCL:0; ARA:14566002|8060799006|461199028|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: sV/FUjILBzMo1Ff4Za3+GVSxxYxN9XWCe8FvC0vtoP5jO6i5s0Vvlb9mHKtokQoAmDp9KRmBn3eGVgKCz6eAj6wAn9mdGvR5syidPNDyxnGrkeviSxzq2VQMY71gjy4LT67pDZFCvpITPlGzAdKpYLwpxHxrBKr6W8iP6Ow2hB3flMtEvAi0IBieoQrixsKEjCQQFy7MbMw+jV9NSdPINutgE6wI3SChVt4njFMoE8JdGZ7gGYI9AgUTBBSjXrB+IIYvL2eJQUnjEDR3+zrOUh8Q5ZIooFruGMXz7pVynjjRTY0lSfpxwRNLG2sFH5etVdQSSQxmL3FC+G9QPKdMB6gY78FrD0e9vJsbXE6EGHeSLshHfN1KDT2g0CaPSIjB3NNBSXGQeM62fmd4qJl0Q/YDz4H+fZeuT4xVhPDP4fzZ/Rw+7Sxrv5xE0FEFTI/z/9DzuprBrZ8gpMqT64VUUw0kgnH+Jsn5tAD29PvLUcU7rNM2cAq2F/Xth9Ys8eMJ4OjXFcZDEg/TabbIv5lcl1a3CYbguhLI8pTb3TkLLST9rAdNVC9iz82Ja7KBOpjqOnmrxhGmmASCwtrRAE8oAJJLb9EobR94il0AyAhHzZ4Bq90RbJICXApSrkRyERkVc8Nex4sdl97evwGRinMyjw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kUq1z2S0j7p7OlnV7kEc3oSOozExgR4SfD5aY7rLoGWqHgjdLPjWv+R6vKaH3WdKFskWtDCbQTtA6PpTC2An6sidvF9pZJZ4Yg/WZmfeCHw8GOemaVvSawdUg4SBXZ0q9kn2wjIDvw4HX9WiB4Svd5k8Kq9JPTX5aiGQe9EEcv0E+JVWMEmezIGJ6P9q1nMfkGKM44wd47DjDOdtgMmWfJX6XJw/py34mlNhdUkGWlzXqbLBZYTPrnQx5I2w6QWvwMvOFpIMwuPH7YSPTV/Zf+TONU+GD630sCwQAL+/2gfOnPz3TH5Wt5gsbJy5BWvmk016jcukGjODW6KbsuSPApSROZ4aMZC31IBUcSrvUb27LaJ6KJJd3x0XP1JsFt046g754r0mSdGl2EVtITn9fYOcN4hTj0/WoayMLb6G/rlrBfejzC6EXNdZwn/plYtNvTQI9lrcCWjUJ6x4lgV/w8KDdL6rJVcC/UmSROUW/1OneKCSXLS+hl3YCy5q76GSAQUNrhte5ylwFzyW/ov1Jaqn/6LlhWZ5QdMXtlL6Rd6TRgLUUf6lk+KKA2RbIiMtt89LcI8FYMjKO0QK4IfCKtue5JTlZRvK+/4FMYhh8iORRstetARfcY3G1vcrHrzmDBY9ZCbUCINuS9H17Nq7gIaQoluM8gpOwUJugVOGV8lm+XBzyud4B9cr91XDRngHCHYBTIc+LILCiYfZkMrq3Pti5IOAoIOGcSEnafPrem+fiU1dZy/1VghLBa3CjwAZpO2bZYTX8tMJhS798VaQ7MuiRk59FQW89TO1JL2ev26+sj5nKG1TK1V9lHeOqWBcn8zRTGJkDNzETmTW/W3QKjgzBJsEaZtMYbzTHMPfMuK5OKPOf4HCIh5lMGeD8N9HAKgoYaw5Z3elB3uwkejmfGAifHAdHnHZeC1yQFtCCwuF0K3coMimWqTiPeaOy3vYkzrLursJFNO3JL3huXEw9bVQKXQyw85mBkjYv49rabtFXXxl6vLTbC85uZwkIM0aRmyhXG9jbypkd03qTVOyeTgDT5cOfpp6mpe37b0J3Zxk3SGAKgzyJTUivaec1JGpzHwkLadK/9h9srVxe69ReoMU5pzH+ojLSTUNugu95vjQEVs78lDUAB0y+hvRn6vT47vUNRdRVVxOKKRFGbDE+baxP1Moi3Y0WbrgLI9SDQRYs5E/2pAt4TenpY9J6v5LOiV2h+a8jdnjDUOBgYn6k1Yi2+KSplsNqgf4Z2zeo6naDKZWfswurfSZxmri64lFarc3QL5KfeT11kY0zThlGw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bfd1ebd-90e0-4ff2-3e6b-08dc99c7c02d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2024 12:17:18.3398 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P250MB0481 Subject: [FFmpeg-devel] [PATCH 05/13] avcodec/mpegvideo_enc: Don't reset intra buffers in mpv_reconstruct_mb() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1UpDiIIcYTGk It is not part of reconstructing the macroblock. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 11 ++++------- libavcodec/mpv_reconstruct_mb_template.c | 9 --------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 620ca08869..31c5dd4736 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3188,12 +3188,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mv[0][0][1] = 0; encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, 0, 0); - if(s->h263_pred || s->h263_aic){ - if(best_s.mb_intra) - s->mbintra_table[mb_x + mb_y*s->mb_stride]=1; - else - ff_clean_intra_table_entries(s); //old mode? - } + s->mbintra_table[xy] = 1; } if ((s->mpv_flags & FF_MPV_FLAG_QP_RD) && dmin < INT_MAX) { @@ -3340,6 +3335,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mb_intra= 1; motion_x= s->mv[0][0][0] = 0; motion_y= s->mv[0][0][1] = 0; + s->mbintra_table[xy] = 1; break; case CANDIDATE_MB_TYPE_INTER: s->mv_dir = MV_DIR_FORWARD; @@ -3454,7 +3450,8 @@ static int encode_thread(AVCodecContext *c, void *arg){ if(s->mb_intra /* && I,P,S_TYPE */){ s->p_mv_table[xy][0]=0; s->p_mv_table[xy][1]=0; - } + } else if ((s->h263_pred || s->h263_aic) && s->mbintra_table[xy]) + ff_clean_intra_table_entries(s); if (s->avctx->flags & AV_CODEC_FLAG_PSNR) { int w= 16; diff --git a/libavcodec/mpv_reconstruct_mb_template.c b/libavcodec/mpv_reconstruct_mb_template.c index 981c837642..ae7a9e34ce 100644 --- a/libavcodec/mpv_reconstruct_mb_template.c +++ b/libavcodec/mpv_reconstruct_mb_template.c @@ -62,15 +62,6 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], s->cur_pic.qscale_table[mb_xy] = s->qscale; #if IS_ENCODER - /* update DC predictors for P macroblocks */ - if (!s->mb_intra) { - if (is_mpeg12 != DEFINITELY_MPEG12_H261 && (s->h263_pred || s->h263_aic)) { - if (s->mbintra_table[mb_xy]) - ff_clean_intra_table_entries(s); - } - } else if (is_mpeg12 != DEFINITELY_MPEG12_H261 && (s->h263_pred || s->h263_aic)) - s->mbintra_table[mb_xy] = 1; - if ((s->avctx->flags & AV_CODEC_FLAG_PSNR) || s->frame_skip_threshold || s->frame_skip_factor || !((s->intra_only || s->pict_type == AV_PICTURE_TYPE_B) && s->avctx->mb_decision != FF_MB_DECISION_RD)) // FIXME precalc