From patchwork Sun May 19 13:27:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 49016 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3924022pzb; Sun, 19 May 2024 06:40:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW9wYtQ8OwT7QunmTpTVxrqWM2BMVGHff1UyDv1Ghknaa2BVOFm8PZ33xAPJKtucxRl5u/dgbK/RHNv6Y32A5oYgz1Ph3HcMhYyeA== X-Google-Smtp-Source: AGHT+IFHqkiEZqlSlxkaBmPBmPC3k3L9fyPam/co9zpPljyZulp/n5f+teyGDXzHjTXRRxIvhopE X-Received: by 2002:a17:906:594d:b0:a59:bb1f:6ffc with SMTP id a640c23a62f3a-a5a2d54c13fmr1690516166b.8.1716126025677; Sun, 19 May 2024 06:40:25 -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-a5ce172046asi466271566b.354.2024.05.19.06.40.25; Sun, 19 May 2024 06:40:25 -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=qsejl0zO; 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 35B6B68C6A7; Sun, 19 May 2024 16:39:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from SINPR02CU002.outbound.protection.outlook.com (mail-southeastasiaazolkn19011003.outbound.protection.outlook.com [52.103.65.3]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 106CD68CDAC for ; Sun, 19 May 2024 16:39:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a6++xkp3F6t7H/gvrbdJhUpxUrDwI0ZzDjvIQprGvn7qYout9coawygFN9zmM72bLmnTq0gte6BePkAEx/XCvyxyD6dLUjCvmK9tKElBVJuR9ITaREO7kyAkoG8noatRJXDwiTXta5lJb1tPb2FnKL9oIojPvi9BAg51ylcsMyQQFTxKpyCcepzGPXXLB7L3lIomLxskAHMaV9CxAtkwa+8nT2crdxZMYnW4bM9lAYF1u4RA1abyZDvlEVfSa9Tk0m3XzOzKQWrh4AxkoGVwp6TYIF0giNB9TC0xJ99x1Q4ixasaiFsfUzwZNsQzPAIVWrTWVig9Xh3LLw37Z65OKg== 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=3RkpwJHj4LkDbIcWNRr/XT3mjATMIFjrlmmlJB4j8lw=; b=QzB8PQ+tka5qVrL/QOTJgjm/B3yhqvdeaS/1EvFneiWiXPgDwrqJl9cXTjq33G59V9cdMxCvxSmeH9IizXR0oysud1LiD+LrN9m6RWaQsJwl7l/gpJAUv9O+n9N0pmBlZataNU+c63jQcFj0775CYwYENY5DJQWz/hEDEsdLyuwflBaFUe4726VMwhHQE9Cc75tJFAPvPtNAXOaWoNYoH36zhjii6Ujv4dxRaOOB8a06DyYmFCjQOQiofd7u7PcVjIWNjsl0tm0fyvPWLZFAbi6ys3L5hfDViXesTJOHv+ux11urwzT2Lm9ESWY0l9Cqw1MRLuxDkP+dPk52u9849w== 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=3RkpwJHj4LkDbIcWNRr/XT3mjATMIFjrlmmlJB4j8lw=; b=qsejl0zOwtlUNJripqZYadIeAwDiThcZuCukb3cZCoj4L0zu5bxw7IHU8eIh8HAkPAiuZxBnuFqQ0iF1QzT3/lj+AJaIN8k+P/iMG+UxxxrA1lkJm7kjeLqHjFnrJJFqUC4yONJayv7al5gQAcarW/pB6iHr6rk4B7tz4D8ZC+kxJDDJ3vxUcPXGOjzkXtAHfgQ7kRmSG8SVKZ76lsa3y2tTDMYlyAdq9QMp+d+lvERfi0vvKTqX/u9ta0YUzHh6/ygurU1pjtAJwDtcL/2P5uFgSG18pYfcgCuI5+rzY/i2O9+BMqAlFkUjUyq647yegl4iH2Tk2RDPmqEEoF4Mww== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYUPR06MB6098.apcprd06.prod.outlook.com (2603:1096:400:358::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.34; Sun, 19 May 2024 13:39:37 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca%4]) with mapi id 15.20.7587.030; Sun, 19 May 2024 13:39:37 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 May 2024 21:27:37 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240519132749.790832-1-nuomi2021@gmail.com> References: <20240519132749.790832-1-nuomi2021@gmail.com> X-TMN: [Ff2hidhjobMzQ/10UIQ1CIWozs+lD6J4] X-ClientProxiedBy: TYCP301CA0017.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:381::8) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240519132749.790832-6-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYUPR06MB6098:EE_ X-MS-Office365-Filtering-Correlation-Id: 0d2fa726-446f-409a-1251-08dc78092014 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: kh6+ZnxppPMR5Idh4h4MziHTdGAm2cmCPOU1xMHcHMh/+LwqkcbLZP0RWduU1MRCJkGC9Of3yvsfd3K82UAapWUuoKk+Z7K/i8ttOSiRBfMPB6RDzlXp6vHa7c/GNiMFpsLqwMYDH6yO2QeUiLE4TcqX9eYi9zD718q8jChEBCX3yN1Q/CX8ij0ENJMM2adJvoJYlvY0Sl+hAftOjhLbHfwiiBZIScqXvm1F/3P1Xud9WGR3tryFFsLUNLtfdauSzNMDgDzZBio9/EZeL0DtSlEGkP216TXjFwi99czvCKNtuyXpGzJSmdmJz+c3aTTL51iGmW9XuD0yg64DgfK/MqzGQKZuUMEfdx0GVGxm1daXXic/Zt1p4fvA+5WWrQMx55MCfOiKP7e5NvwsvJ3lRmoNh0+o8N1w/PXIWHJs1MY2KSC92lHABBbh17pb/fNlBDWbZopHvpwCTZgfv73n5Zb48EUejcR+sPNE/F/AIJimRXwslJptEM33xaURjRQkPlQsD4fISBsDBllehoJirFWMF1K/8ZcnuJpVa+x+7wtUsqs49B5IkQ5uxJI30wWV9j/FNryE2mhadM8obKkxofebfgIzEndoQCTpm6Ztxu3hulYG1qs1DGpV3M4czCBK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: enajgKAVNEtuIaQDF8dgEJTgX8oMOfw+BaJ5VKFgg/Svdf+xD7rqafAI9Y8Js26J6fCiIHM3DgCC9B4HnETmmq8e+pCZPhBJGPlMJp/1OdEUOowfF7I0LYQFopMmX9DeqnB9gXsEQkW/zqP87KGz2E+nmT0OYvrWITPFVAEjUffMSdGWFTKoSmdHr1QVUNkd7w845usdLdzwTJjBGmnPz/5PxGPam4pF+1rg0wj+8o+xjjG9BAQCQMCfJ+Bp5dyG6xcYUVyzvkK094OqNNk89PMszrGlKA59HOTQWxe7a1I4kUYtLdtvFCPVrixTvCnOLbAyQZ7ce3rhgf1DsEmQw+15b05tJt4aLPvRarjhhviG6DB0EGTJ9NcBJeor+UiXjYmEXllSTZ/yFzj9/b3ZxiBlaYxrqLJpXVHDc/MhNIUN21rnB+V+xHZ1a+o3pTwanSDrOF7ybQPPPcxly/XTLlEjLlU10pq0WTnb2NsToiVDoVvkKM+PUfG6UcDCbPtZ4l30AdyzPn4ZA/yohqboddK7ir8Hgh+VcBJ5MsQQUKvinXRbXRwCPSzxBLt4DP0wtX4lwQa7VRaQ/yT++Xy8ge61J96auUSw+yvipeAn9u9x6lPz1u4YkcgOJ3fVNMik48RgNeM/wuhpwGnR1Q0xqxacupZVSr23WYonbC2d+WiAxs3p7jLrCFXv6QCgR2VXIFmcaw50q46vUhr9gsTg2hXZoQvWMJbKmZpLSd/tkgmiYmrA5Lp8/TozTmmucXHi+mggD3jjYG+y+I5VYwmyGA7LXiQ8E3PnFpr7JSYsdBMG7UXYFQAyI0XJJ/3BmVvjofLrKH2SILAr2GeFtff9fl06Ogz44mkDeVpFUjh232HzxJbqvyyrKlum2bGKom1KT5JtqSByEnOQfQ3HCpm/EEl93y1kWQUqvfF7IiOeb/fEIGi/v62U61Zq9bSdjMDTQSyT/CKk1JAWJ0tZMISZW2yalctl3+wMDI2vrhnKmbJ+kw7253uxMKZolxg3lsahQPeRkibwDHco5Z+9p1D/1+vUYX75aeg7MYUazmv4O6iPmFS2vFgJENnL/J11s3eChV+/weEFa+1kocR/ddNAmW5h9lWH09VRGDiq2CGnVjreWSVtTCH5pIlsQ6wLeMj+cm7gbTNA6dkPyUDn7GbbAjU+aFE3Yzoqo9yhJUtgT55g92iOzFKPIffCBSlf6hUTykOSBEJJS8ZzPoS5EO2vjFlzl2EnVlClk+FrSjvupleBaSjpFbtx+AIjPjRBV37nvvUMA6bXE50/sbHK5LMSsw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d2fa726-446f-409a-1251-08dc78092014 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2024 13:39:36.9953 (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: TYUPR06MB6098 Subject: [FFmpeg-devel] [PATCH 06/18] avcodec/vvcdec: refact, unify pred_regular_{luma, chroma} to pred_regular 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: f3+HGNW7pd+C --- libavcodec/vvc/ctu.h | 3 +- libavcodec/vvc/inter.c | 133 +++++++++++++---------------------------- 2 files changed, 41 insertions(+), 95 deletions(-) diff --git a/libavcodec/vvc/ctu.h b/libavcodec/vvc/ctu.h index 4e38ecf54a..337d0e7c28 100644 --- a/libavcodec/vvc/ctu.h +++ b/libavcodec/vvc/ctu.h @@ -380,8 +380,7 @@ typedef struct VVCLocalContext { DECLARE_ALIGNED(32, int16_t, tmp)[MAX_PB_SIZE * MAX_PB_SIZE]; DECLARE_ALIGNED(32, int16_t, tmp1)[MAX_PB_SIZE * MAX_PB_SIZE]; DECLARE_ALIGNED(32, int16_t, tmp2)[MAX_PB_SIZE * MAX_PB_SIZE]; - DECLARE_ALIGNED(32, uint8_t, ciip_tmp1)[MAX_PB_SIZE * MAX_PB_SIZE * 2]; - DECLARE_ALIGNED(32, uint8_t, ciip_tmp2)[MAX_PB_SIZE * MAX_PB_SIZE * 2]; + DECLARE_ALIGNED(32, uint8_t, ciip_tmp)[MAX_PB_SIZE * MAX_PB_SIZE * 2]; DECLARE_ALIGNED(32, uint8_t, sao_buffer)[(MAX_CTU_SIZE + 2 * SAO_PADDING_SIZE) * EDGE_EMU_BUFFER_STRIDE * 2]; DECLARE_ALIGNED(32, uint8_t, alf_buffer_luma)[(MAX_CTU_SIZE + 2 * ALF_PADDING_SIZE) * EDGE_EMU_BUFFER_STRIDE * 2]; DECLARE_ALIGNED(32, uint8_t, alf_buffer_chroma)[(MAX_CTU_SIZE + 2 * ALF_PADDING_SIZE) * EDGE_EMU_BUFFER_STRIDE * 2]; diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c index cc93184ca0..3bf06d6d53 100644 --- a/libavcodec/vvc/inter.c +++ b/libavcodec/vvc/inter.c @@ -482,98 +482,48 @@ static int ciip_derive_intra_weight(const VVCLocalContext *lc, const int x0, con return w; } -static void pred_regular_luma(VVCLocalContext *lc, const int hf_idx, const int vf_idx, const MvField *mv, - const int x0, const int y0, const int sbw, const int sbh, const MvField *orig_mv, const int sb_bdof_flag) +static void pred_regular(VVCLocalContext *lc, const MvField *mvf, const MvField *orig_mvf, + const int x0, const int y0, const int sbw, const int sbh, const int sb_bdof_flag, const int c_start) { - const SliceContext *sc = lc->sc; - const VVCFrameContext *fc = lc->fc; - const int ciip_flag = lc->cu->ciip_flag; - uint8_t *dst = POS(0, x0, y0); - const ptrdiff_t dst_stride = fc->frame->linesize[0]; - uint8_t *inter = ciip_flag ? (uint8_t *)lc->ciip_tmp1 : dst; - const ptrdiff_t inter_stride = ciip_flag ? (MAX_PB_SIZE * sizeof(uint16_t)) : dst_stride; - VVCFrame *ref[2]; - - if (pred_get_refs(lc, ref, mv) < 0) - return; - - if (mv->pred_flag != PF_BI) { - const int lx = mv->pred_flag - PF_L0; - mc_uni(lc, inter, inter_stride, ref[lx]->frame, mv, - x0, y0, sbw, sbh, LUMA, hf_idx, vf_idx); - } else { - mc_bi(lc, inter, inter_stride, ref[0]->frame, ref[1]->frame, mv, orig_mv, - x0, y0, sbw, sbh, LUMA, sb_bdof_flag, hf_idx, vf_idx); - } - - if (ciip_flag) { - const int intra_weight = ciip_derive_intra_weight(lc, x0, y0, sbw, sbh); - fc->vvcdsp.intra.intra_pred(lc, x0, y0, sbw, sbh, 0); - if (sc->sh.r->sh_lmcs_used_flag) - fc->vvcdsp.lmcs.filter(inter, inter_stride, sbw, sbh, &fc->ps.lmcs.fwd_lut); - fc->vvcdsp.inter.put_ciip(dst, dst_stride, sbw, sbh, inter, inter_stride, intra_weight); - - } -} - -static void pred_regular_chroma(VVCLocalContext *lc, const MvField *mv, - const int x0, const int y0, const int sbw, const int sbh, const MvField *orig_mv, const int dmvr_flag) -{ - const VVCFrameContext *fc = lc->fc; - const int hs = fc->ps.sps->hshift[1]; - const int vs = fc->ps.sps->vshift[1]; - const int x0_c = x0 >> hs; - const int y0_c = y0 >> vs; - const int w_c = sbw >> hs; - const int h_c = sbh >> vs; - const int do_ciip = lc->cu->ciip_flag && (w_c > 2); - - uint8_t* dst1 = POS(1, x0, y0); - uint8_t* dst2 = POS(2, x0, y0); - const ptrdiff_t dst1_stride = fc->frame->linesize[1]; - const ptrdiff_t dst2_stride = fc->frame->linesize[2]; - - uint8_t *inter1 = do_ciip ? (uint8_t *)lc->ciip_tmp1 : dst1; - const ptrdiff_t inter1_stride = do_ciip ? (MAX_PB_SIZE * sizeof(uint16_t)) : dst1_stride; - - uint8_t *inter2 = do_ciip ? (uint8_t *)lc->ciip_tmp2 : dst2; - const ptrdiff_t inter2_stride = do_ciip ? (MAX_PB_SIZE * sizeof(uint16_t)) : dst2_stride; - - //fix me - const int hf_idx = 0; - const int vf_idx = 0; + const VVCFrameContext *fc = lc->fc; + const int c_end = fc->ps.sps->r->sps_chroma_format_idc ? CR : LUMA; VVCFrame *ref[2]; - if (pred_get_refs(lc, ref, mv) < 0) + if (pred_get_refs(lc, ref, mvf) < 0) return; - if (mv->pred_flag != PF_BI) { - const int lx = mv->pred_flag - PF_L0; - if (!ref[lx]) - return; - - mc_uni(lc, inter1, inter1_stride, ref[lx]->frame, mv, - x0_c, y0_c, w_c, h_c, CB, hf_idx, vf_idx); - mc_uni(lc, inter2, inter2_stride, ref[lx]->frame, mv, - x0_c, y0_c, w_c, h_c, CR, hf_idx, vf_idx); - } else { - if (!ref[0] || !ref[1]) - return; - - mc_bi(lc, inter1, inter1_stride, ref[0]->frame, ref[1]->frame, mv, orig_mv, - x0_c, y0_c, w_c, h_c, CB, 0, hf_idx, vf_idx); - - mc_bi(lc, inter2, inter2_stride, ref[0]->frame, ref[1]->frame, mv, orig_mv, - x0_c, y0_c, w_c, h_c, CR, 0, hf_idx, vf_idx); - - } - if (do_ciip) { - const int intra_weight = ciip_derive_intra_weight(lc, x0, y0, sbw, sbh); - fc->vvcdsp.intra.intra_pred(lc, x0, y0, sbw, sbh, 1); - fc->vvcdsp.intra.intra_pred(lc, x0, y0, sbw, sbh, 2); - fc->vvcdsp.inter.put_ciip(dst1, dst1_stride, w_c, h_c, inter1, inter1_stride, intra_weight); - fc->vvcdsp.inter.put_ciip(dst2, dst2_stride, w_c, h_c, inter2, inter2_stride, intra_weight); - + for (int c_idx = c_start; c_idx <= c_end; c_idx++) { + uint8_t *dst = POS(c_idx, x0, y0); + const ptrdiff_t dst_stride = fc->frame->linesize[c_idx]; + const int hs = fc->ps.sps->hshift[c_idx]; + const int vs = fc->ps.sps->vshift[c_idx]; + const int x = x0 >> hs; + const int y = y0 >> vs; + const int w = sbw >> hs; + const int h = sbh >> vs; + const int is_luma = !c_idx; + const int do_ciip = lc->cu->ciip_flag && (is_luma || (w > 2)); + uint8_t *inter = do_ciip ? (uint8_t *)lc->ciip_tmp : dst; + const ptrdiff_t inter_stride = do_ciip ? (MAX_PB_SIZE * sizeof(uint16_t)) : dst_stride; + const int hf_idx = is_luma ? lc->cu->pu.mi.hpel_if_idx : 0; + const int vf_idx = is_luma ? lc->cu->pu.mi.hpel_if_idx : 0; + const int do_bdof = is_luma && sb_bdof_flag; + + if (mvf->pred_flag != PF_BI) { + const int lx = mvf->pred_flag - PF_L0; + mc_uni(lc, inter, inter_stride, ref[lx]->frame, mvf, + x, y, w, h, c_idx, hf_idx, vf_idx); + } else { + mc_bi(lc, inter, inter_stride, ref[0]->frame, ref[1]->frame, mvf, orig_mvf, + x, y, w, h, c_idx, do_bdof, hf_idx, vf_idx); + } + if (do_ciip) { + const int intra_weight = ciip_derive_intra_weight(lc, x0, y0, sbw, sbh); + fc->vvcdsp.intra.intra_pred(lc, x0, y0, sbw, sbh, c_idx); + if (!c_idx && lc->sc->sh.r->sh_lmcs_used_flag) + fc->vvcdsp.lmcs.filter(inter, inter_stride, w, h, &fc->ps.lmcs.fwd_lut); + fc->vvcdsp.inter.put_ciip(dst, dst_stride, w, h, inter, inter_stride, intra_weight); + } } } @@ -720,7 +670,6 @@ static void derive_sb_mv(VVCLocalContext *lc, MvField *mv, MvField *orig_mv, int static void pred_regular_blk(VVCLocalContext *lc, const int skip_ciip) { - const VVCFrameContext *fc = lc->fc; const CodingUnit *cu = lc->cu; PredictionUnit *pu = &lc->cu->pu; const MotionInfo *mi = &pu->mi; @@ -742,9 +691,7 @@ static void pred_regular_blk(VVCLocalContext *lc, const int skip_ciip) ff_vvc_set_neighbour_available(lc, x0, y0, sbw, sbh); derive_sb_mv(lc, &mv, &orig_mv, &sb_bdof_flag, x0, y0, sbw, sbh); - pred_regular_luma(lc, mi->hpel_if_idx, mi->hpel_if_idx, &mv, x0, y0, sbw, sbh, &orig_mv, sb_bdof_flag); - if (fc->ps.sps->r->sps_chroma_format_idc) - pred_regular_chroma(lc, &mv, x0, y0, sbw, sbh, &orig_mv, pu->dmvr_flag); + pred_regular(lc, &mv, &orig_mv, x0, y0, sbw, sbh, sb_bdof_flag, LUMA); } } } @@ -804,9 +751,9 @@ static void pred_affine_blk(VVCLocalContext *lc) if (fc->ps.sps->r->sps_chroma_format_idc) { if (!av_mod_uintp2(sby, vs) && !av_mod_uintp2(sbx, hs)) { MvField mvc; - derive_affine_mvc(&mvc, fc, mv, x, y, sbw, sbh); - pred_regular_chroma(lc, &mvc, x, y, sbw<