From patchwork Thu Feb 22 07:14:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 46435 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp173943pze; Wed, 21 Feb 2024 23:16:02 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX2Zdelmz/tchZn3raf/iScyxiSlvydq5XA9xB+7QkApF373WSbLKLB7OqICoCTchP0SnKoBEYyAwfGt5PGJa6ZRodUxY8Cd0xz2w== X-Google-Smtp-Source: AGHT+IEuqE+8vn9wbRjp8IfhIQScMwP5W5tWYZ9hfEQqstUAvwp8RHPp8C6Q3Tglk8FpKIFKJ9ei X-Received: by 2002:aa7:cf14:0:b0:564:4a18:45f1 with SMTP id a20-20020aa7cf14000000b005644a1845f1mr11537871edy.17.1708586162518; Wed, 21 Feb 2024 23:16:02 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z10-20020a056402274a00b005642ea075aesi4892031edd.314.2024.02.21.23.16.02; Wed, 21 Feb 2024 23:16:02 -0800 (PST) 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=eC2UfAxb; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 862E168D22D; Thu, 22 Feb 2024 09:15:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2011.outbound.protection.outlook.com [40.92.53.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DBD668D207 for ; Thu, 22 Feb 2024 09:15:10 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jw0FfsIFJWS+UCgiY19+fKlviZ99NDAOpEU2P30rHA/bpeSg449Mqzwf+YM9itIYKGkwwTulH3NGUubRwiRCYEYp/BmhItFIaxFNf1EmIS84MAHCyOApFtJ/vfWdV3OefGb3MAdbUOade8Xo69vOfH2tLEm7gyhy0G0EqOgCpgBxZWVV3Xpr1sIVmiMTJ8CcADhEhRvcw4KRA0jNFTlo7Pxdzy03mmSOLe/nwV9EcGOevsgpWKp/S4DL+WOX469ioq/JvltSUNgEu/masWsg4wuE4L/HWEiOLYwoj1CzAXrpvRNVuIhkHZlOEo+rRkohiWENhH7MhQdhRqlrGDLMxg== 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=SMLZA14ovFhLgkJWzzG8Q9GQ+fV7PNzR3CP/vtKw3AA=; b=Mvj4JHZHfgrjCyqC43ByEwCMQvfdFvYw8wt66xX4lcDKmmeCKXvzjZhde163tKcaR+wwNwojbyLMmhhxBzkjtVQSbwmO6mzlRIqa6HtO/IC6HllFDCr7Z4yiaGjNJ/cBMUurDoxdbJcH1acuKwKc7TZabYBztVBZ567i0MukGW81EJUsQ7zJIQ6T2P/yWL15qIT4GatB3bRhWFqnJSqWiZnC7/PzXZWPLAXSUZFPIBbskvS+SOAbB95/iQAzjb4OvFke9WkcfPJyDSY5YevP7MM/zxl3fpIEBX6yP3s7IscZL/Ce3gAQbsKfV97GjK7Ha9ga/iUF2u1azb2n3Gyvxw== 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=SMLZA14ovFhLgkJWzzG8Q9GQ+fV7PNzR3CP/vtKw3AA=; b=eC2UfAxbAgOVy1pN4QzCuFIzisAf3bPPdiznZ+M+1us0ef0VNEgZ5cniR92dqM6GtUPEZylEHdyppxHC+ZEaslHwWSlhaNgnZyiyLROmg6SmtMNOa6CqOLVcrVRfIZ4RtU40tuzRJXTYKy9XvQ/VcJG55ZfSdCQU1dAV0YJv3XnfpQUki88HSsyBCQUdWrZPlfK0BBii/nqAX6dhwuVF48Ehc2A2UvBHF5gDXkX+L5HNegDFv+ncdPc7P1+dGIvE6JQ0FEb6PVUE/O6g40TN3tAWssvE+RSwc31KLUxI8dUnXbrZpQm7Sz88p00leQ0YFOHCaxXukDgRjo3ZEnV8Aw== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYUPR06MB6241.apcprd06.prod.outlook.com (2603:1096:400:358::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.38; Thu, 22 Feb 2024 07:14:51 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::e139:fd7a:1b66:a3f7]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::e139:fd7a:1b66:a3f7%7]) with mapi id 15.20.7292.036; Thu, 22 Feb 2024 07:14:51 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Feb 2024 15:14:02 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240222071406.5714-1-nuomi2021@gmail.com> References: <20240222071406.5714-1-nuomi2021@gmail.com> X-TMN: [6L549GjogQXF+SF29sSGAdAoyAeqFPU1] X-ClientProxiedBy: TYCP286CA0049.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::7) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240222071406.5714-8-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYUPR06MB6241:EE_ X-MS-Office365-Filtering-Correlation-Id: b2f58b68-1b67-49fe-7560-08dc3375f5fa X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oBna2UQ45j17t1AZ1M3mfNCyz0V4JXzCAndzFbJYjal6OQkxGTXvv0H4hRvIPjzgu0lM2IXEv8/NphoGPXwXUEkuQOw2CnrXUOH1HgooEhkd7Gq+cUk8MDLEtS2jxn4+CflIr4l6/7rOUrR4wUeHSeLLX2R457VIcH8n1tu5bgWS71ajwOVZ55SBrY/Rs/uFlrV4hdOg/gMl72dRmMoy62eUB1FKXifRzW1qbnXMuz0PcIy7SE5zA7zoMEPe9X3G22dCp2mwp+UryrtjApXZKWe42ZFtRXKPpEu5jH2r43ybBWxYRQT/zPLuBHc1vXYl53FI08AkDo6VnGZM46khjSnClw0GUA8aeBIPBxZKT3ZX70RUbU3tjyKf8DWSoNFLHZESPvlgpfKmLo0G6EbP9yykR/PdhElCtl4cpzasacJyIKCMrVDHPMi3ZfQp/7d1C1VMUttxbShrJ7CP06B9vwlrpoiDnXg98a3bfMdzB4Bc0suNZKO4Mtq+70SgGPjylUa0BRRzzOuA5CAiM0xKjC8oqLD7Eog+lrOr4kzt0fKfFo6V5wcieh7SJc6hQPzIAVhLKN+dPp1f+sQQXLV3I6Vie++TvL/pnfdYGhOTJYXvzFM3AfXjxC3VSzkpqYsd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1H+JY4YdfOXanslsfgY+AU0UxClcQi3+ahwWE8VBC+x6Upi/GBVTwc/78UixVlkkEQpKbeFxb+y7fHHO6UpzLCfQPphwIFDNWmaU3VKlX32zb2/U94RoqmZI12QBCZt2dCD8vjtSHS20U/qi1rmJlrWw9ALmCaxZvHEKw0wRzkHm4iPxKVsXYuEm6eWH0vR/PQX+kVuUfucf05KPR3qVcsomAokML7xoO/DNc8hBTB4FZnpU979Umu2DbVxu9i+Mszo6pUFYceyCXALUjJ3VwtERMD2FKKQKIG+CDo0DbpTel6LDxRfbbVQWXRN9ug6+aSJ9UKf3yKnmmNla4sYPUvgvAzE7yiJkxONyqHdomdj7oe/C05noUEgbS+nK/Qy+SDIAvrA3KE0yra/SxXo8qovyA8M9foN5l/znHpnOfDqWtyv4zRZlnlfSwmZ+qGlAYciINJiBpbbUEP6ZHB1/67/pfKmUyuY/Fn4Hx/K3MLyh9Uhwa5dzu0wTeiKRd22HtUHZzn2ldA10coj6WJZM8YlL4LIke5E8Y0gTGMsU2ImUiuZPR6iIJZwFN1M1He4DB9G+KUkFm13lqJwbxzCH79gPpxF2Y4n2ARs6oN4WAM4xcyRMwmK2DxTedYAhgs5MLJ61eqYXzX/plX+Gg4s3w/fmrTEhCCXnQuJXuTe7L0K9HzbnTk8lrnZ6zxwdPSJDmBNAYMSGzRHfjaLpior48vUTijH0nYlfEh/cu+PbsbhnPRHMrkAXHXpAOyIEfvPIRFfaDdjCgLc8Gpq6AWlo4LesdEbZzc/cm7JI0CDiB9Jkm7u1sIQBgjBoRjC7iM5ogXdXXffhMxgfiETL6cMKlwaJiv24gwhSfs0Vm3s+Kr6Km9SufQV5rDNOsiOObaavvX293nJJghF3PDpIyceudxgPgp5sYf6VrJ4Ylac7zwTHkRUNFQec76QDk69hsw1UmVHh2zkj4qQE+lkxdxl/7i+Qy31EZ4Jn2IjCAoOQZSZeIiySha95S2hcFwtmMuLcC3a2apTMSO2iDNdccJxnAUw7r4PFwOHy6khsItJDeSwgfW7U/sBvb/oXFNSTCFbKEuA+KAjDO0HMojD56opwW7E8pl5tRvDCxow65AJf+txN0oNUWfGebR2FZQ5kvnwu/YqJIAH5alDbDT4U5csHJ+3MKutLJEuJ4C4oikCYTqOSXw4c74Efif0LAb3vikzaqGshUCOQEvMRfND/ZY+BrqviCEbGmZUqGnMzIOB2vfVCfZN3kbLuTkw3xhYyeWEb8D8RSISYkmCGCwwsv9l2vw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2f58b68-1b67-49fe-7560-08dc3375f5fa X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2024 07:14:51.3170 (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: TYUPR06MB6241 Subject: [FFmpeg-devel] [PATCH 07/11] avcodec/vvcdec: ff_vvc_set_intra_mvf, refact to support dmvr tab 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: Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GcJ9orEvg6q9 --- libavcodec/vvc/vvc_ctu.c | 2 +- libavcodec/vvc/vvc_mvs.c | 4 ++-- libavcodec/vvc/vvc_mvs.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/vvc/vvc_ctu.c b/libavcodec/vvc/vvc_ctu.c index b78a1417c7..00476c81e4 100644 --- a/libavcodec/vvc/vvc_ctu.c +++ b/libavcodec/vvc/vvc_ctu.c @@ -1776,7 +1776,7 @@ static int hls_coding_unit(VVCLocalContext *lc, int x0, int y0, int cb_width, in } else { intra_luma_pred_modes(lc); } - ff_vvc_set_intra_mvf(lc); + ff_vvc_set_intra_mvf(lc, 0); } if ((tree_type == SINGLE_TREE || tree_type == DUAL_TREE_CHROMA) && sps->r->sps_chroma_format_idc) { if (pred_mode_plt_flag && tree_type == DUAL_TREE_CHROMA) { diff --git a/libavcodec/vvc/vvc_mvs.c b/libavcodec/vvc/vvc_mvs.c index 8af57e8ed3..8fdbb00a41 100644 --- a/libavcodec/vvc/vvc_mvs.c +++ b/libavcodec/vvc/vvc_mvs.c @@ -262,11 +262,11 @@ void ff_vvc_set_mvf(const VVCLocalContext *lc, const int x0, const int y0, const } } -void ff_vvc_set_intra_mvf(const VVCLocalContext *lc) +void ff_vvc_set_intra_mvf(const VVCLocalContext *lc, const int dmvr) { const VVCFrameContext *fc = lc->fc; const CodingUnit *cu = lc->cu; - MvField *tab_mvf = fc->tab.mvf; + MvField *tab_mvf = dmvr ? fc->ref->tab_dmvr_mvf : fc->tab.mvf; const int min_pu_width = fc->ps.pps->min_pu_width; const int min_pu_size = 1 << MIN_PU_LOG2; for (int dy = 0; dy < cu->cb_height; dy += min_pu_size) { diff --git a/libavcodec/vvc/vvc_mvs.h b/libavcodec/vvc/vvc_mvs.h index 6c46f9fdb2..358de5ec45 100644 --- a/libavcodec/vvc/vvc_mvs.h +++ b/libavcodec/vvc/vvc_mvs.h @@ -41,6 +41,6 @@ void ff_vvc_update_hmvp(VVCLocalContext *lc, const MotionInfo *mi); int ff_vvc_no_backward_pred_flag(const VVCLocalContext *lc); MvField* ff_vvc_get_mvf(const VVCFrameContext *fc, const int x0, const int y0); void ff_vvc_set_mvf(const VVCLocalContext *lc, const int x0, const int y0, const int w, const int h, const MvField *mvf); -void ff_vvc_set_intra_mvf(const VVCLocalContext *lc); +void ff_vvc_set_intra_mvf(const VVCLocalContext *lc, int dmvr); #endif //AVCODEC_VVC_VVC_MVS_H