From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3275549776 for ; Sun, 19 May 2024 13:40:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2216268D0A3; Sun, 19 May 2024 16:40:00 +0300 (EEST) 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 C4DE968CAC9 for ; Sun, 19 May 2024 16:39:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j1yBU+PGcOh0FwJjwDQUwcCp4EvcR1qYbackdgwChmLjfLYJmy2JLZhyEgQuBsu+z8lK+FJIYmdiQui7onw+t1Cl4ht8HDT2BBk02SoUAp6Ltu9eOQ3XqbuuVAkECfmtwfyjpD+UK5DRbKoQ6u0Xy7PjI6zIJpLeZZuqgkdbPmVOMy7Ew9bBQojENkSYNf0fjbkoGJjJN0Xpaq19gfjfEhIydKLTxO+7NOiDo1HrbWARo28T6QI7HXKNg3uNFoX96nhjSbtcnfyqMfp78RG4C0ziaR7nLoePhktMhoseLc94YdLoCEmXCf4e/7aBeCWTwjGeHIZowT0tErN6d3j/HA== 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=BKYx8ntkqYVCiCIJu4q2TbtXD9pi8Th1H5JProzlz6w=; b=l+pkepBWhhCNgxoB/YS2QZs2Fgsv2ME9N3OW43dSWPmppkWom6ebFnnO/k6KvYmEMNAu8HCw3utH9TMXu+4AuwhsyXJHiqF9ErKNRU/MIVj++gmXlwwywKfAabYLiw7nTJzg4xix1WwS/9N0gXn6oHMFWXUeQamU1X6xbwf6Vu6QlX6KmjJk5lIGZ+EhpxQclb5YzK9ANNksFSXzb8yEfZYVWGqvg+dpDlJxDjga3HljWG/59SuzKTD8JINvIgn6EFKTcqIKaLF1CTPWGF66tliQPCknk4oKI6NMj8fDfI1qvLQjoImTFUxjhhLmbgwxIs/xoPDs83w4b9BcrEYHMQ== 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=BKYx8ntkqYVCiCIJu4q2TbtXD9pi8Th1H5JProzlz6w=; b=ixCA+Wp5Y0C/s15MyfFLPlz7BExxiy2peHrVqXxn4k9bbwS4yhH817vcAqiUswUr9ZqOMw4s5QjOlzqdV3c+UX9NSCyjJrJgacTQ6YxzfWekl/9D1FS8zVAK5HO+e895/8XVR2qXsVZ5fTuBJZ9E51iP/Qs6HLHhEn3Xt+Hu27Yhu1HgeXPZmLGbcBKpWZn0rRyKT39IB7BluPaVa0z28a3enGFzS3wdvJNTuU6n6yGZYcmxvfVDr/OQ4gmuslcUo8NnrzqaQkVPptzernLtO6z/Rsl80MlA5bmlSdXajl6XIcOSK549POVC6mMoW7fkfpN5fm5EULOgLQyabYkopg== 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:38 +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:38 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 May 2024 21:27:39 +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: [VRWJk6AauBmBc+bWFAeL/yqzvy1ftGA5] 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-8-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: c4af293c-ff1f-4694-2d88-08dc78092107 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: zI2MDwISdOBGqgLPvrqTZo37gFoiGCWAi1oatLk/u9KyQepD/4Sc0LjrGwVLJ8EZJgrSfxt3fgbxicSjamj6PxCQjup6yf2GLALZbq5B4KTTZkHD5FeWf8XvnS88FhCbkCAr7AsHDPep+UYkm1JNZriYlPXaszrh7uViXwVpbW0MBpR/FVyzM1VMSvUCWDz4s1txk6AlkNl0/NlCZNwPjBXiLuzpmWhEwaz3Q0NCBKV6zC6vPCtekgkvtnUFuMZPJeSNqc6bF//2wkXx2NRqasPZh52zXZ2n1Vhr463cTUk6Cma42Sm4oLi1txtX/LqXvsIMh+l5lngniL9tQOiJWsVRxlxp3t0gq8xsGnE38+1pvT0pHOD7BOf0RmzBgRVjBfQRXrcJ8q77C7cbf3NjiOGo++6JwJ4ZGMq1gyj9gL/BXrv6RU08Z/HprSbVF/M6eP0iEgrIfTJw4GGwng6/PBZuF6sMPzSJUlP5b27VN2dY6qBF73uUpMqCzgHpsDMeNr5UshLDMW5Qfw6sMraotAnK3d1UvlKaWwJLLUmrDw5CUmAQQpYrE2wX8reU8USaO2Fg17vbHZ/OU3l6zFO0zMIRPUpXsmgoByoF7a8Nu10tWXQ+Vfhs6PAQ2LDRG4nD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DRHU54raue6LTZF6OrR+Ywq3Aw1fjh8Ukvbq9Jv8aA9p2gJedtirlAzKlq9l?= =?us-ascii?Q?icNJf2pjuSSpKVB0Zu1wE7Y9j4NqK4h+/ltyAX74xPRbdEheD4137n9C4eSl?= =?us-ascii?Q?mdXjhYgW9dNT9Z0ylia1r/uM7Fpm/IWjmlPtOQvjxsADybzFPgjgbsu/KziG?= =?us-ascii?Q?LtLXSO6nYxbZMZIs6cWUMey5tBFT0XayAojyyQvyqIzKuwrwlQKsV+rQ56nL?= =?us-ascii?Q?lTR7y8cTWFKitRKfFtFAhvH6isCt0KDHfeLAzX0cxhvqickgLvDMollCdord?= =?us-ascii?Q?KFmJDfL5arkOhBkJsNhj5ReUlGpUZkVRgXW/Nzzno2pq5PhwycpjNVay45E2?= =?us-ascii?Q?+3OehDm7VnurGV8xv46GJcWXWfKxlJ+Kr3xKTw2l/9z8B0ws4kwcLtb327L/?= =?us-ascii?Q?ITm90c9InVwI5nsAZqMMus3tv7q1ZYgC7PBaIHzZYLBbEbhnZ+cIgnbm/ylX?= =?us-ascii?Q?3tf09B9eAsu/xjCegs4diBEMnT26Apj/vCb1CoyVWBaAVeN6DG3DW1fo9wA8?= =?us-ascii?Q?DToJbHS6WykGd6rqLN7DVt5gHS4zdi1B50TTJVu1yuS6tQ6+0AqkDm63iGzb?= =?us-ascii?Q?5Yn00N6u7j9+dG9EQzdebs6gcAgJ2cyhNGjDIJ+5/UtErq09AohWVpAVg7xK?= =?us-ascii?Q?v87AXcF06EDOqitIDfO1BxVvoQL2rffYfEBgC3+L3tC/9YsnmLap+lFlm5NI?= =?us-ascii?Q?P7PH3RZ7UcJET3ExinB7emdsEybxMqMlZ8xJ2AS8zth8nYTevZ1CaXTbdgKZ?= =?us-ascii?Q?HRKe01ieQeAy0vyS6EFrDMwkEF4hDegKaC2hXaSTebb/vbePM7l4a2htVzK/?= =?us-ascii?Q?f4jMfFxv312cyZJnQdaailSVOmJPXuRWaPjji7MbIT56ciw/84x0SC1QwC8d?= =?us-ascii?Q?if6uZ6nUiiHYHIpZh/4AGgu+mqxDNWyNXLVc7xjznztT2VcRvRzg/uzM7hO3?= =?us-ascii?Q?ZetcNIjyNrvWwQstb0DWo78+sCS6Sz4BzuUOqkBVowBRwLcdCRXIKmW57QS/?= =?us-ascii?Q?DWlrsysHXe8FYiTQqU936JkJewJ4VcBVduuvdNnOhfAUuv2gTxNMdEFi9DWT?= =?us-ascii?Q?kVcNHLU+RWUu8F688A4WvA2Wcv5PXnOO7pvjaJWqzf2l3P9zhR3c5uhsc9DC?= =?us-ascii?Q?c9TWsdKQijI0uwuMmnW4TJ19vazq1Y10SDXSsci29kY2pCGcCRuqXiVSxJ+P?= =?us-ascii?Q?iu+t05ijLR0l/22qVbAz6vOOfQicnNN/A3UiLxY7dittMY4qSoBDES295REO?= =?us-ascii?Q?tsB3m+t5q+oDSjhTVq/DmO1GcKoeaPKN2XI0oJ2/eg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4af293c-ff1f-4694-2d88-08dc78092107 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:38.5853 (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 08/18] avcodec/vvcdec: refact, pred_get_refs return VVCRefPic instead of VVCFrame 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavcodec/vvc/inter.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c index cd96707c02..23d9ac05e6 100644 --- a/libavcodec/vvc/inter.c +++ b/libavcodec/vvc/inter.c @@ -387,15 +387,15 @@ static void luma_prof_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_ fc->vvcdsp.inter.avg(dst, dst_stride, tmp[L0], tmp[L1], block_w, block_h); } -static int pred_get_refs(const VVCLocalContext *lc, VVCFrame *ref[2], const MvField *mv) +static int pred_get_refs(const VVCLocalContext *lc, VVCRefPic *refp[2], const MvField *mv) { - const RefPicList *rpl = lc->sc->rpl; + RefPicList *rpl = lc->sc->rpl; for (int mask = PF_L0; mask <= PF_L1; mask++) { if (mv->pred_flag & mask) { const int lx = mask - PF_L0; - ref[lx] = rpl[lx].refs[mv->ref_idx[lx]].ref; - if (!ref[lx]) + refp[lx] = rpl[lx].refs + mv->ref_idx[lx]; + if (!refp[lx]->ref) return AVERROR_INVALIDDATA; } } @@ -487,9 +487,9 @@ static void pred_regular(VVCLocalContext *lc, const MvField *mvf, const MvField { const VVCFrameContext *fc = lc->fc; const int c_end = fc->ps.sps->r->sps_chroma_format_idc ? CR : LUMA; - VVCFrame *ref[2]; + VVCRefPic *refp[2]; - if (pred_get_refs(lc, ref, mvf) < 0) + if (pred_get_refs(lc, refp, mvf) < 0) return; for (int c_idx = c_start; c_idx <= c_end; c_idx++) { @@ -511,10 +511,10 @@ static void pred_regular(VVCLocalContext *lc, const MvField *mvf, const MvField if (mvf->pred_flag != PF_BI) { const int lx = mvf->pred_flag - PF_L0; - mc_uni(lc, inter, inter_stride, ref[lx]->frame, mvf, + mc_uni(lc, inter, inter_stride, refp[lx]->ref->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, + mc_bi(lc, inter, inter_stride, refp[L0]->ref->frame, refp[L1]->ref->frame, mvf, orig_mvf, x, y, w, h, c_idx, do_bdof, hf_idx, vf_idx); } if (do_ciip) { @@ -660,10 +660,10 @@ static void derive_sb_mv(VVCLocalContext *lc, MvField *mv, MvField *orig_mv, int if (pu->bdof_flag) *sb_bdof_flag = 1; if (pu->dmvr_flag) { - VVCFrame* ref[2]; - if (pred_get_refs(lc, ref, mv) < 0) + VVCRefPic *refp[2]; + if (pred_get_refs(lc, refp, mv) < 0) return; - dmvr_mv_refine(lc, mv, orig_mv, sb_bdof_flag, ref[0]->frame, ref[1]->frame, x0, y0, sbw, sbh); + dmvr_mv_refine(lc, mv, orig_mv, sb_bdof_flag, refp[L0]->ref->frame, refp[L1]->ref->frame, x0, y0, sbw, sbh); set_dmvr_info(fc, x0, y0, sbw, sbh, mv); } } @@ -734,18 +734,18 @@ static void pred_affine_blk(VVCLocalContext *lc) uint8_t *dst0 = POS(0, x, y); const MvField *mv = ff_vvc_get_mvf(fc, x, y); - VVCFrame *ref[2]; + VVCRefPic *refp[2]; - if (pred_get_refs(lc, ref, mv) < 0) + if (pred_get_refs(lc, refp, mv) < 0) return; if (mi->pred_flag != PF_BI) { const int lx = mi->pred_flag - PF_L0; - luma_prof_uni(lc, dst0, fc->frame->linesize[0], ref[lx]->frame, + luma_prof_uni(lc, dst0, fc->frame->linesize[LUMA], refp[lx]->ref->frame, mv, x, y, sbw, sbh, pu->cb_prof_flag[lx], pu->diff_mv_x[lx], pu->diff_mv_y[lx]); } else { - luma_prof_bi(lc, dst0, fc->frame->linesize[0], ref[0]->frame, ref[1]->frame, + luma_prof_bi(lc, dst0, fc->frame->linesize[LUMA], refp[L0]->ref->frame, refp[L1]->ref->frame, mv, x, y, sbw, sbh); } if (fc->ps.sps->r->sps_chroma_format_idc) { -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".