From patchwork Sun May 19 13:27:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 49027 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3931089pzb; Sun, 19 May 2024 07:00:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/WbQEbgu2YwNnnz2ire4duy+lxE20TV3yrz3pWCyVMI19AzV3KQy4ZuwTviRxWAtTk8AN/ytQErFy6cEPN3pWMQQNaps2758DfQ== X-Google-Smtp-Source: AGHT+IE2XDBhzmBx501/agbtrrLAV9cispklfH5abDu2wkfXYkhgzXd4jfVN8xjQnHgcMlQZj0JR X-Received: by 2002:a05:6512:2104:b0:518:9b42:b846 with SMTP id 2adb3069b0e04-5221006fa19mr16237491e87.21.1716127205243; Sun, 19 May 2024 07:00:05 -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-a5a17bb1aedsi1230639866b.552.2024.05.19.07.00.03; Sun, 19 May 2024 07:00:05 -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="q/LVgfkO"; 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 561D668D030; Sun, 19 May 2024 16:40:11 +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 C810168D084 for ; Sun, 19 May 2024 16:39:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CPaxzubvr7ituzmtl7OSSbaia4k/5gY8Y6tBl+gRd+pK6RHBS+Em9KCxjdujQ3mEC6R1dSN9u/7TTOWhKBwt1dxmd7t5jBOAfLoUyMQviBKvxeRHckG9v2Rw8LUDHa/41eslZmioq2tdME6nX4DsJTCFAptDiiNdzir8F27HQmenaldVaEvvwkAtDSxoYy3qR/6H0cTS1bdmecAhNH5e9xSSz6t62WalqIIsm0aofSP80U4hEeK0UAbCUGZOvmB4mTVmxDQGuS9z6vpKx2/17SSbvdjgOY/PIZR+j11/Kgfpu2otjNqjjMCSz99MYwQclvzbFYEPAIup0wsMkiwlKA== 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=VrItx9QiTdpIHXL/KR8PkE+0IaPq7+wZ8gBPB1BjooE=; b=Gbb7+cDGZVmqREPO+VjAGrEon+RKjRMuHSXrX1Awr6CP7cVYQ2W7riQr3ec7yGj0x9cwPGkoV0fZMeUt/ftqPdyqiG2lJy27xw8ZNe1niwt1ALpuAXZoa1+NrV1dgxDT52kyUFu8sOfTtNYAveDHa0pLyTvJh0HmVaQbvCySJ8lSL5CEyu/9JQ58CfOMPOeDbzJ3QzVdPg6PzgYZ+fDjHhosjig2MLsmQkHjrL4bo4ZRA4lFrEtLg6KOtuZUtOuALKgXPz6JbgAxkoJr289knSr4m/zWRole0JMhV75tg1xFol9gf93+SKTev1y8LbhYTZFEQuoWIdauqt6NBR9g/w== 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=VrItx9QiTdpIHXL/KR8PkE+0IaPq7+wZ8gBPB1BjooE=; b=q/LVgfkOvTjWcfwMx7S1Y/BaDUIzLKu+bE/b5D3PgZp9otKrf0iq5i47iE3/l2tcBy7GYTPvUbq79zT0ASle05plau+6E1L37pbZM7hsqN2IZj39debvUT13O4XOjrnPShbV+RfC6sfvQy2CDeqyBeISrqrJ+pBPOqspAru2mqlbpHi/GlIiNldcoAId/Z5at68hi2bS38URE+KVp6SLYfaPA1CX8oiqw0QJOTbPEkb23/p9VVb1jU27/ltidkm/N9mQ5cJ0afUgTUw4nEjgE6VpVtcixqzgXtOHbmGkEOmYAgK96Ue0ISWJFRitrEI/prZ4m7FABevCfvXMdkwGCA== 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:44 +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:44 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 May 2024 21:27:46 +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: [PWKZTYmrR7d+Uyy7xq7O21pgG2r8zZ4R] 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-15-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: bf09aceb-b68c-4ec7-d1b9-08dc78092456 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: cyXluRJJDrturWLsrFrdH5o/LWFWu5TCSegHqDq/QuuEKEdzMcDsh/FEKu8N4fusIbrgoHfLTzr9ILqtLlL//Jsd6Y7PdHZL23xo3OC8EQL0pWZHThOfDbrVz7cl7Hvjp3gkAuVmLWJPt7NFUVVZlwmBPKDIxJM/iqJGbGx7YgEy/VPg3eu0cYLIB2KjG0s2qPMUGjEb9nO0fICWFSq9NaD6Lp4a3jWxytL4+tz1w3DTFoh8yHIIvYqjNwB1RU1qAym6rTLhDXJQ8xNJsHE1NmF9hfC173NPk0tQ6HvAcNQSae2j673IN/x8Urh0oOMlSVCFy33Zvhg4y/yExA532yOYVvbAM1EVS3xYXzVlilHDqPfdD6hTgMsT+D1+vca/A+hWe78AhX9Czu6d83+c3e87BFFFJA+9rS+EdmYiA2mGSzjQJJE6vWkIE/3ti8Bv4JyzpPnnhDPs24NLs2L1dSGVS9fre5IT/Sllyi4gnnGSmyvUzZGP4vBHgMq11Yv7zkGjSQIEIuMixd6OyJP8dvAmXmG+gdDgWAg5MRkqPgnsgbYnY+cC5Pek7015oZQA6VeFocETHnljkgBh/WexcmuUxk8rWrkdOSvul/Y9xp8= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RVEfV6QD9HF/c96yXsGypPqkLX/YzgmNVQ5yzyiBLTkPA6lBAQW6CtfK4//CZmbsNtvOaeG6z/IXA+8zYozksSsPwoxrFpkx7nc8q+UqxY+PCpO9zq3/NsuiU20y4aBiJGIqclyehNXOQp9jO6ytOtfBQ84UpyKIkU3VuPr33pp0UCUzdmRsdVgXROy1mip5/Jsk7IaN+b09FyxNhAYjpdXYm/KvW8F6etDJjzj+eqYHV8nr5nGLwwkU71dFHzf2FJg5ldjSFKbQZa33fvM7/gJarhefN9UQGzW3KTsv6abmC42hC4j/HYN45Q3+kyvRZWJpetPwF8TdcK4VkdqJvyiSvo1CzyEzvxRREUXMzvDHfvKk5bsBXfpTDMTJiO6jA5zybZQ0eRktZQhN3UfouzonBV8beXBe3p+m8k7hpwezxtU3uEXCoOwbo/Ylw4xys5hGHJbIuIu75c3F6/4R0ZFO5PScg195b7jCDbgwQ3FbYyXY/zexPppiWDp5yU4/niD6BsM7mQHJ0nm7hSvFBH1w7q7vVYGPxaBEL/voHen9CWwQRGXg3Ykzmpg8qow23mfyCKROGveNwxyrTVhcz2LYvHdQ1srtZusXxYA4tRE0ppJ3JCLOItLxYhezsUBzyHQWmsC2qphAAy/llEUfnThxUW+UiPHGetveGo8jk/xSCQbzziRie29OM1Li42neOhsic5bWJ7Z+Pwos6eMQNPfiYociuv6taQq7BBiSx8Llsqt28NAonfxKa5WrGdAwPSrcXHhoPjqiHYYa9WBx0SOUQJJfjsxhdn8VBQHQcsGmuU7a7tLIuCp0HWQqARpNwI7cQups9IqD6Qb8uyZ/2kHvP0OL2sYuXVPrLL6azd5klgctDvSHXGYcth1qQuera0CG2PjA7M1NbPf1SRFXhZdnQLfMqX+jTyffYsGBV2I2gT+qfgsOk8ZjTSjXcsZedRfKCUra9AsOdVlJimaDU2BRtowjG/LskchzukSQmcO7Y2rVCzOZ5h8RvcRUZSYH8RVpdFGZOUe43l0bq1wVhr4uDZYuVmZd4vGTCcwnbQKYORKSgwnvnnuoOeX5vPrjr4EhoAv0UDhvDjxIfR+y+1Wfj3jtzRqq39e2B2/W6UZiXMYynSyfBXWqCJi/GA/d1o0PfRc53wK4aTRPgKNaLgy7UgxTfd5Cus0GfL9qRJiN55zJ79uH9G+lCI1h1D5GXKtqzKN/dVANgp6ElDu1yIl5n5+Kl+YLuCNkFuQQreTem/tNYC0JKL9m6vR5uuxMOpumFDv50YOIGoT8rQuh9A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf09aceb-b68c-4ec7-d1b9-08dc78092456 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:44.1489 (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 15/18] avcodec/vvcdec: refact, remove hf_idx and vf_idx from mc_xxx's param list 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: kaTl0ht3VY6i --- libavcodec/vvc/inter.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c index 23b9a8af6b..5d553708d9 100644 --- a/libavcodec/vvc/inter.c +++ b/libavcodec/vvc/inter.c @@ -208,6 +208,7 @@ static void mc(VVCLocalContext *lc, int16_t *dst, const VVCFrame *ref, const Mv int x_off, int y_off, const int block_w, const int block_h, const int c_idx) { const VVCFrameContext *fc = lc->fc; + const PredictionUnit *pu = &lc->cu->pu; const uint8_t *src = ref->frame->data[c_idx]; ptrdiff_t src_stride = ref->frame->linesize[c_idx]; const int is_chroma = !!c_idx; @@ -216,8 +217,9 @@ static void mc(VVCLocalContext *lc, int16_t *dst, const VVCFrame *ref, const Mv const int idx = av_log2(block_w) - 1; const intptr_t mx = av_mod_uintp2(mv->x, 4 + hs) << (is_chroma - hs); const intptr_t my = av_mod_uintp2(mv->y, 4 + vs) << (is_chroma - vs); - const int8_t *hf = INTER_FILTER(0, mx); - const int8_t *vf = INTER_FILTER(0, my); + const int hpel_if_idx = (is_chroma || pu->merge_gpm_flag) ? 0 : pu->mi.hpel_if_idx; + const int8_t *hf = INTER_FILTER(hpel_if_idx, mx); + const int8_t *vf = INTER_FILTER(hpel_if_idx, my); x_off += mv->x >> (4 + hs); y_off += mv->y >> (4 + vs); @@ -229,9 +231,10 @@ static void mc(VVCLocalContext *lc, int16_t *dst, const VVCFrame *ref, const Mv static void mc_uni(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride, const VVCFrame *ref, const MvField *mvf, int x_off, int y_off, const int block_w, const int block_h, - const int c_idx, const int hf_idx, const int vf_idx) + const int c_idx) { const VVCFrameContext *fc = lc->fc; + const PredictionUnit *pu = &lc->cu->pu; const uint8_t *src = ref->frame->data[c_idx]; ptrdiff_t src_stride = ref->frame->linesize[c_idx]; const int lx = mvf->pred_flag - PF_L0; @@ -242,8 +245,9 @@ static void mc_uni(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride const int is_chroma = !!c_idx; const intptr_t mx = av_mod_uintp2(mv->x, 4 + hs) << (is_chroma - hs); const intptr_t my = av_mod_uintp2(mv->y, 4 + vs) << (is_chroma - vs); - const int8_t *hf = INTER_FILTER(hf_idx, mx); - const int8_t *vf = INTER_FILTER(vf_idx, my); + const int hpel_if_idx = is_chroma ? 0 : pu->mi.hpel_if_idx; + const int8_t *hf = INTER_FILTER(hpel_if_idx, mx); + const int8_t *vf = INTER_FILTER(hpel_if_idx, my); int denom, wx, ox; x_off += mv->x >> (4 + hs); @@ -263,7 +267,7 @@ static void mc_uni(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride static void mc_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride, const VVCFrame *ref0, const VVCFrame *ref1, const MvField *mvf, const MvField *orig_mv, const int x_off, const int y_off, const int block_w, const int block_h, const int c_idx, - const int sb_bdof_flag, const int hf_idx, const int vf_idx) + const int sb_bdof_flag) { const VVCFrameContext *fc = lc->fc; const PredictionUnit *pu = &lc->cu->pu; @@ -275,6 +279,7 @@ static void mc_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride, int denom, w0, w1, o0, o1; const int weight_flag = derive_weight(&denom, &w0, &w1, &o0, &o1, lc, mvf, c_idx, pu->dmvr_flag); const int is_chroma = !!c_idx; + const int hpel_if_idx = is_chroma ? 0 : pu->mi.hpel_if_idx; for (int i = L0; i <= L1; i++) { const Mv *mv = mvf->mv + i; @@ -285,8 +290,8 @@ static void mc_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride, const VVCFrame *ref = refs[i]; ptrdiff_t src_stride = ref->frame->linesize[c_idx]; const uint8_t *src = ref->frame->data[c_idx] + oy * src_stride + (ox * (1 << fc->ps.sps->pixel_shift)); - const int8_t *hf = INTER_FILTER(hf_idx, mx); - const int8_t *vf = INTER_FILTER(vf_idx, my); + const int8_t *hf = INTER_FILTER(hpel_if_idx, mx); + const int8_t *vf = INTER_FILTER(hpel_if_idx, my); if (pu->dmvr_flag) { const int x_sb = x_off + (orig_mv->mv[i].x >> (4 + hs)); @@ -515,17 +520,15 @@ static void pred_regular(VVCLocalContext *lc, const MvField *mvf, const MvField 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, refp[lx]->ref, mvf, - x, y, w, h, c_idx, hf_idx, vf_idx); + x, y, w, h, c_idx); } else { mc_bi(lc, inter, inter_stride, refp[L0]->ref, refp[L1]->ref, mvf, orig_mvf, - x, y, w, h, c_idx, do_bdof, hf_idx, vf_idx); + x, y, w, h, c_idx, do_bdof); } if (do_ciip) { const int intra_weight = ciip_derive_intra_weight(lc, x0, y0, sbw, sbh);