From patchwork Sun May 19 13:27:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 49014 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3923920pzb; Sun, 19 May 2024 06:40:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUczNA4t6QPE6I/Hlcwtawr2z8uS8aVRZONMlDaNcbrw/ihVruL/3z5L1NPbd++0IhN3z928YFzbgPgdKdjRV02tbfJjBEMOvSBbg== X-Google-Smtp-Source: AGHT+IEj9v8Xg4XBeRrL1srHsjlVRc7z0f9umUma0Oy8L1EHnYchO9ADFbk1yOdt6rgUyBX7hb4y X-Received: by 2002:a05:6512:3ca9:b0:523:8bce:3db7 with SMTP id 2adb3069b0e04-5238bce3e92mr11353083e87.68.1716126008227; Sun, 19 May 2024 06:40:08 -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 2adb3069b0e04-523a6a0edbbsi3218316e87.128.2024.05.19.06.40.07; Sun, 19 May 2024 06:40:08 -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=RYS3LGXR; 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 78E4F68CF50; Sun, 19 May 2024 16:39:52 +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 75A0068C978 for ; Sun, 19 May 2024 16:39:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YtwdaLskZbvU3WapdYThajSZUb8Nx4sMcqkZq2KVasakA1QafVLTHXQ1mlBgoc8kr4sR24S40VKzw2/MDYq/jGxl2Fwfdh+PKkX7vb9TiqB1+JISNoSE8rQFx1PyCOkefL6LT5z2x9K6SastJJuQYxR7fCFHPSTF7rv3IxTnNbDLzIuiz3au0t6QDZapVuz6ny64MtkAklEEIuvT5/ZQKIoTWRlZIhShkQX/Bt2+5B5XA5kIPsMmwFrFF9cg6oY+YUdyJ4mNRHX7khtrJaV42BafWVIhX97mYA/7lfTnP9je6Hfb2poehzkUPfSlgG/gUX48ThRs17xYGHI9G+g2Kw== 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=ujysOU+nreSUbZ8ZI5awMuHpefWu/dGPavlyxPxqMCg=; b=T40P9uDKUc+abjelIb2j/R9FtiAFUmOMpaz3i8i/YvkX0Pc1qNPcBr/5nbCe/dBZarABWvON+OBNTfAjdCJUX0LalyvzQwpl91DQR6KuUzPlmKDMS6lAttkGtveEZ2y1yUV6ZKkFBAXVv1+3Pu0rFNxo2ZLTTmNx5gc1G54J3HNbi/GA5/vYtNAyB2CsvEKYdhp0pqLf+MwIUwh7uGkPAvm+Dnk03tN9sD/QoPBGPnmrvMIG8W5OMpawq/3d9S0tXx/y257Fm6G7glPiV6VNqFyAiUo+fYheUsTvKa9ftAikxx1isdaE0fQn5do7ukMZMZgWiXeaqwmokYTpNZJW2A== 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=ujysOU+nreSUbZ8ZI5awMuHpefWu/dGPavlyxPxqMCg=; b=RYS3LGXRLhKxCT9qqQ3E7n4FwscKYmpJV76NsttinVTwVw+088gntWfBku3Z4RMjvIA06h8dUwCjb48SPgDifVyBYofnn3VQIE3aFT8b9VC50qqywSvv8jMxBnE4TPhLdsH9iXH+lj8zNFFHYMS1LJkjJrLd8TbNgAQKNrpd9907NL6nqMgyuyz1Q0r9aqeUcbyK7IrKsEJOPmMFrO9tg+i4K5zq7FtN1EN+gf/EXYEMRgZ+CvDIZnrFbhMIHODtdF3adR17KQCjyCggIRysRFfUWrCzVWGoK0m2FfOWlZ4933sQgiinY0SWvwVRxufmCMNXCfEfT2goCnnHCKITUg== 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:33 +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:33 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 May 2024 21:27:33 +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: [pLVghEMlIsN/XOsP3rVVeekYkoV8SFDu] 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-2-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: 2a656994-ca51-433a-851f-08dc78091e28 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: lP+/EVnx38ibHOg6Dn+2VP+6LmgO00KYB9eN/F+RQx9OsMBv9gKlBwpSdg3XRMwx/GNpp7aokccDQTujaAuSRT3qEtIKpQFPI3JqD2o7RB0sbuKVlqVlQDCNzdGiJ/04QIZSwKput/QRPm7PI3fis1gK0+q5WYLIRrlF9YhseMww5DiCR7QbYG8Ss2Ro4yAyWjrMdWEHb25VsdnHkUw1j3l/ysBMl+rCL3MO1ewavyCkRzuscQ5MVFsms1N5qX8A3W2mTce5Hj/l5R+GA45QOTqC7WpaLwTmtGBHS5lsh8JD69yrH8sx0tdKY9u/P6kw6nbsJQFSWfaFIqpNLMltk0ThiuLzXkRRhlD6TCt2A9x4Q5eY6rhnEYWLIFD09l9AHfDbXXWXpbT9TWJW8gbInRM90br5SoCE5cMvLhRDaDCZ4fhnFlBhjDOqyfOTtjK/NWl5LuFM1/E+4ng1EEaJgHB7pnsy2xS+tHzNcaGihV9q0vabjXFNHkJAJVuJD4obDW4IUcVfqAwz/QIE8d/Gv2sPOrzegH4RqPwcX88/Rze9UQcAPHb5AKNGL4zonELAZ9YDB4fB3o4C7QESbXOOChcaa52KHKQ9AORPGd27plFHxUt+WPbmrSn50DpMFL1p X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6LXV0swcKOwJVrd2t+mhGWXkbyD351HmEEWm6Xb6NCo4JSoGSpS5fRoW4JCoGeWBlfCtPgK7cNNS+uSi5FqYKr/rFbFGXH2acKfC1blxkao7VgIBG2Zku73nD1CQoZixR0JmDA2fqM6oT1w/vPECcgrj+fRR50I0SDh59IVBKyLLownITvAcdjMgAZ1RjZtKn5Kn3I4LgkREyCm/rsxIBi47D9rLSpUGzMEHL6TNCgrs1ufYn5o0mV81UiG5LXs9LIr4ed9wFzqhpa3ZMkrxzuA/899YbYDE3O0N+GhgCPPzI4lQpUn4I3uNQU1nZWbC/u9SM9bQN8zw/psjigR0wFBlSCgG0Gzqni/hn07ZKzJXuHNualV6GnL2FJE1VnSM9MSXuVUpXnJ3oy/6arWiHpn05eC6Yb0YgVIFUCm5P8A6CbzwjClM3q4Fr5VxNa3qxALuGopIEEArHT5wvgvkd8ztQzMlduOuCIOtHF49tdZG9mX5yujT/naIOXhoEdn1LNWrEOERfa9RwS60S2xcUDbMpfQeIyDOMKYD8vFe0HnGSxzEFKgZ3JO/uHSa+2XsfUE8MjNXPGDtG4FcbD18KfboIxaasaOh3/xOPM/EPUFzqVPhoFsaxwu0QiKXGlWP1iQp1ipg72l/q6Rh4wG18CD/qmxI1LFRoGasBR/8t0D8SNOpQzvoAXEf1XR6+YJ91l/tUBAt1MY476uvb6jlfVUFvrHmGLpFq++4KBx0zRfmz2c9hDTu87SkSLlg2pjOwaezqS5ckv0/iPqIVSJGt5Hq2poMLGPLrJArluB4nQnGofFw7efAm8OnzY6SwcqcZVmW6BVObnqHqAjQOXRJB13sPUcx72FuwPlPF4aDKXisezBqJDJLQUxLs6J0gCU4MFw7gPUsJ5dbUSRskTZcYKxWBnTAqc8UkGaHXE+R4gJ+gDQgKz+R+ikQdwpG40fDiOZZXMh0Jble12609SE5JBfn2tuxs6qZZBbgT5oC3gDNUwopIstCvgfvKnjNI0XLaEfDilKNmqxl66M+clwvixlNHMG1LPMzTeQfWx5rWrMCV5FIhMRzyNSFGBJipgxbmQ35MY3XN6z2dgZO8ympIs7cSfTRpi+iyso+lwvDaKzVRFcINBL7bnjQwaFFzG8cSiUxVSAcOqqe2s3kPBRVqwR+q8B5ZB/z/2kfGcMwo7AWzJbAfAFc/ury4wPfr9+bgNWQ+IsEj4JVnTHEFOoqc7TJEWWF4RAUduNC1nEL4FqvEhDEm4ONP4TmyVmA96jD1HuV46VcC5KFQKhg/7GWTg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a656994-ca51-433a-851f-08dc78091e28 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:33.8114 (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 02/18] avcodec/vvcdec: refact, unify {luma, chroma}_mc to mc 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: iTBNYC7TRE4E --- libavcodec/vvc/inter.c | 47 +++++++++++++----------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c index 3f0718cb5a..8657541eaf 100644 --- a/libavcodec/vvc/inter.c +++ b/libavcodec/vvc/inter.c @@ -142,6 +142,8 @@ static void emulated_edge_bilinear(const VVCLocalContext *lc, uint8_t *dst, cons } } +#define MC_EMULATED_EDGE(dst, src, src_stride, x_off, y_off) \ + emulated_edge(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, is_chroma) #define EMULATED_EDGE_LUMA(dst, src, src_stride, x_off, y_off) \ emulated_edge(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, 0) @@ -209,47 +211,29 @@ static int derive_weight(int *denom, int *w0, int *w1, int *o0, int *o1, return 1; } -static void luma_mc(VVCLocalContext *lc, int16_t *dst, const AVFrame *ref, const Mv *mv, - int x_off, int y_off, const int block_w, const int block_h) -{ - const VVCFrameContext *fc = lc->fc; - const uint8_t *src = ref->data[0]; - ptrdiff_t src_stride = ref->linesize[0]; - const int idx = av_log2(block_w) - 1; - const int mx = mv->x & 0xf; - const int my = mv->y & 0xf; - const int8_t *hf = ff_vvc_inter_luma_filters[0][mx]; - const int8_t *vf = ff_vvc_inter_luma_filters[0][my]; - - x_off += mv->x >> 4; - y_off += mv->y >> 4; - src += y_off * src_stride + (x_off * (1 << fc->ps.sps->pixel_shift)); - - EMULATED_EDGE_LUMA(lc->edge_emu_buffer, &src, &src_stride, x_off, y_off); - - fc->vvcdsp.inter.put[LUMA][idx][!!my][!!mx](dst, src, src_stride, block_h, hf, vf, block_w); -} +#define INTER_FILTER(t, frac) (is_chroma ? ff_vvc_inter_chroma_filters[t][frac] : ff_vvc_inter_luma_filters[t][frac]) -static void chroma_mc(VVCLocalContext *lc, int16_t *dst, const AVFrame *ref, const Mv *mv, +static void mc(VVCLocalContext *lc, int16_t *dst, const AVFrame *ref, const Mv *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 uint8_t *src = ref->data[c_idx]; ptrdiff_t src_stride = ref->linesize[c_idx]; - int hs = fc->ps.sps->hshift[c_idx]; - int vs = fc->ps.sps->vshift[c_idx]; + const int is_chroma = !!c_idx; + const int hs = fc->ps.sps->hshift[c_idx]; + const int vs = fc->ps.sps->vshift[c_idx]; const int idx = av_log2(block_w) - 1; - const intptr_t mx = av_mod_uintp2(mv->x, 4 + hs) << (1 - hs); - const intptr_t my = av_mod_uintp2(mv->y, 4 + vs) << (1 - vs); - const int8_t *hf = ff_vvc_inter_chroma_filters[0][mx]; - const int8_t *vf = ff_vvc_inter_chroma_filters[0][my]; + 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); x_off += mv->x >> (4 + hs); y_off += mv->y >> (4 + vs); src += y_off * src_stride + (x_off * (1 << fc->ps.sps->pixel_shift)); - EMULATED_EDGE_CHROMA(lc->edge_emu_buffer, &src, &src_stride, x_off, y_off); - fc->vvcdsp.inter.put[CHROMA][idx][!!my][!!mx](dst, src, src_stride, block_h, hf, vf, block_w); + MC_EMULATED_EDGE(lc->edge_emu_buffer, &src, &src_stride, x_off, y_off); + fc->vvcdsp.inter.put[is_chroma][idx][!!my][!!mx](dst, src, src_stride, block_h, hf, vf, block_w); } static void luma_mc_uni(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride, @@ -543,10 +527,7 @@ static void pred_gpm_blk(VVCLocalContext *lc) VVCFrame *ref = lc->sc->rpl[lx].ref[mv->ref_idx[lx]]; if (!ref) return; - if (c_idx) - chroma_mc(lc, tmp[i], ref->frame, mv->mv + lx, x, y, width, height, c_idx); - else - luma_mc(lc, tmp[i], ref->frame, mv->mv + lx, x, y, width, height); + mc(lc, tmp[i], ref->frame, mv->mv + lx, x, y, width, height, c_idx); } fc->vvcdsp.inter.put_gpm(dst, dst_stride, width, height, tmp[0], tmp[1], weights, step_x, step_y); }