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 1BEB947A6D for ; Sun, 28 Jul 2024 03:19:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9319E68D773; Sun, 28 Jul 2024 06:19:23 +0300 (EEST) Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01olkn2077.outbound.protection.outlook.com [40.92.107.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 988DC68D73F for ; Sun, 28 Jul 2024 06:19:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CfnqWz6r9HJOSZ7W3pcUcR/uhla7isoEWlEuZzdEfqakW2TJwbWvrKE6BTBcYJwbxiF4+EATRoC5G8xxv0HbOv8hxaIWxySa2YYvXwuy7c2n9uxO2+T0J8rdutU07yc9xYT8+resiYggheCx+UJopFisViAeFjBOUekKzEsPSYWlhoDAtWRmtN2LaGqa0jRbMh434tiI5ea6D0eAe12SjtOK79y4QUOgJ2CwMMYYNrVxDxKKYBVcAsoQam7VY6EdYv9aiaGjND3yM2dFwYA1HkYw6Y0UF48PLzv38KfqFKO2BbTpwpVI/KDZlXTqb0qE97sSSoKPVqCZBtVBvSGwQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=4HHKQFYTCw8ImF+qjBgzDotiNxwNIyWAHm+yyMZbGy0=; b=xLCQeqa2wXTQuKFo/Wf32mdBIELitoG4xB4UkngaX1jRwnhYh4MnHm5RHsqb35Rfp+HqKXIj7Cev31+3kDzRraBxZkA3ovpDEiorYRX+fekVFF0JErqYUUfKGKgWHWpl+7YImb71xI6Cx1wVDFgo/5F8Ik4m5ySc9PSVn3x3QgqPQVRlEMZhuKqn008HgqSk7/Ngx3r9g0mUAi7KQdxVsN7Z5899EQCCvHieXI/50WH0e5FXcqHFs66Ub/iUWJLADYOvkYSn0rsBUJ2Cv5GBtxO9w0o7iYaU1Vr1FrkvCeH3RQvHWyCFiUB8mmtYhWfqVjF3JDZPORmMG9b7MzKc/g== 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=4HHKQFYTCw8ImF+qjBgzDotiNxwNIyWAHm+yyMZbGy0=; b=dukTItfobfzIR+BSMkMeZpqqtlpX8OBIyDTaaVIjVu0MQqdRQ2Zogd2lCVEfonr3ez1duVMVVWQ3PiGBuqUKth3IpivbVZMzYYAR+FLYczHirJFJ+syK4/I5UpL+MBQIgAk0uPc7aIfgpPw494znk+SeO4GHB2lV0d2W1Hzwb6FQ9i/ZDGQHY9HMlsDkjr0Vz+Srpw0Czv559+S3OPbAv08CQBThCu6ZoDajRs3emHNjZJIy88Oa0QScGbyKKF5XgpTx8aNBcqN3bUVNMM8iQacXqXMA56EAR78uIfgPW3PivETJGX/flz4NvBEMy/krZNtUYzYI0Qhp1izkG3v5Sg== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by PUZPR06MB5747.apcprd06.prod.outlook.com (2603:1096:301:f4::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.28; Sun, 28 Jul 2024 03:19:06 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca%3]) with mapi id 15.20.7784.020; Sun, 28 Jul 2024 03:19:06 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 11:18:02 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240728031807.462810-1-nuomi2021@gmail.com> References: <20240728031807.462810-1-nuomi2021@gmail.com> X-TMN: [ziTB18lejE1AVDHWoN5+mJpymZKSu2+O] X-ClientProxiedBy: SI1PR02CA0016.apcprd02.prod.outlook.com (2603:1096:4:1f4::17) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240728031807.462810-6-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|PUZPR06MB5747:EE_ X-MS-Office365-Filtering-Correlation-Id: a698a129-70e2-4d53-565c-08dcaeb409fc X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|5072599006|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: p/AcPxvZZifQyPBYJFsykedmfe2gXagOqE/71UBAo9VmeWyJ004HARJ9mybDPD/tcuEhBSMzP5A6fuVZL31qXDEdh80js9ZkWLzof9SGp0n3QJrmxJHwZat25a0kxXwKu7r8U2APKAdWvaHOm+wpwRjTPr2GTRKqfO5unslC3KWW5PDF6lFa/B8MOsY7bF5+990+mA0luYGzd6nzAoUwmv3+31CMy73OifAoBCTT9i8jN03nUu48SFAELfBrW3um7PZn0cWobsmIzlF0FJoouVPMlidKG4liFJVTDFlRx0KuIKf3flk6yWzHBUVYGJPEhMVbKXBOY0nteZpLaWdhs2f5UkRp+CYvdYbrXmx2EYEDLbc3Wllgb5PxGD8wMuQeiUqQiybv1x7tbC2hIlnaWPscsgXPUJDqDROxjOkCD4UdV92xvPhKjYkr4Ooa9IGfKRb4ccnXyH1FFLBongw8LaOhTc/pkp0epcyCBJBKezHEo293xU18fWXm2sOvriTuy/NgNfBsXyH0JzvhhAnn6lPP8MQH/pzX2/0hfCbXHguSmyFLP/soQyxu9Z+2MNotR+Bma/3pNnA+8lUX0XQp4zMbgnEQLUltFgB9ND+PnLsCiOutz9wQLsodzOGoK70kKF99GhMiivY6LMTKqmwOaVWRoLbdZuqOQoLbV1dm4pze84Nn+ydefRUGHRIqqh6nZptuh7ayaMec8xs+oEkxWw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vpe9oeFKwbJODbP/2chJ2Gg/iqICiUCN2v75Z6NEPpPXyoIyazNvf0Ob0VSh?= =?us-ascii?Q?pKwCzmkWWhsX2B/gfE2I5CUFClxPF0kX1Itq8t8bpzpWw/CHESRIaNVgH/gd?= =?us-ascii?Q?374rg3b70jyAM1xoNNqxEn1CU2GUvJqnVmwwpcuux9jVb9SsAckW1p2a8Cci?= =?us-ascii?Q?y3IeoBl3oaHgqMabzJieYTP3KwlbnChBd4Dn+GBTg96KB9Sqh5MxNibHERsE?= =?us-ascii?Q?V5DOHffkuL4GVY+X7aH0IF2XZTzwqxrZHbbGjM5EVt/D5G/Efa7eA7f9oOLk?= =?us-ascii?Q?HDxtcZsvxnVxHQHr+iSri95xtyK7zeklt3k/HBQh54CaHaosymLW25vUfemE?= =?us-ascii?Q?cbq06hDR68TdcWnQbpOphxzu3IhIoSodgGOCVqMxhsRXMSf4J8WLYoOrUqto?= =?us-ascii?Q?nAu1zMqVnO9u0IV7/PpAvTEAzsKOjjUAYc+i8NkqhTu5VkBsNIbbwEgPzkEh?= =?us-ascii?Q?MPjBB/rugH0Zt+e2361PfJEmuG+MLwyzuo2TldxtXPLIkAaOfV2F37auslWN?= =?us-ascii?Q?fTmnvUSKooRdWXcCVHwFjssw38aU2llaFIkDUlPsLy8Ek/QWhieiLuoJCZ08?= =?us-ascii?Q?POp5yaj8dbGCKuJR1pqmf366L3ITTpvQdr9L8pUhk3qD8EYlme7eJcxrfgsb?= =?us-ascii?Q?8fpkcqapCfApP2SjVGcHWbBjkETFYddYKjWRlwUCJNMet5mTSBlzRxKvYgAd?= =?us-ascii?Q?r5HuNnArFw2ddwIY7Mfm0H/mv0xy3YAWRM31/TH6Ee683dZ+pfVniiWwn1gV?= =?us-ascii?Q?imnRa1PzKHKyjUcMoQAzmiOOQlqIdv76H8bDotX8J3rTC+VSgoRhih8zZtoY?= =?us-ascii?Q?VH2ILJNoumjib8m1RM86MkcvFMZ+hVfNIB5DJqh+13az43NQp2ajGhCgDFWL?= =?us-ascii?Q?vcGsGFVCKytRPhnI+LzC90xFHjv1Lx+Z9+TUbB94EQbpJCM9dR1jZ9xdeTwu?= =?us-ascii?Q?fRx4LuMFBQasM+kA1L/StrmsStdQ/bU6OGaX134FT0+axHWsAjkjcBFHDnTg?= =?us-ascii?Q?C5hySjdQ1jeRcauLZmFxIRjzzOqQ6mPHXJrJztAW3Cu5J+G1IzQoP7vAEYOz?= =?us-ascii?Q?Qyz6qnnrWoeY6UZqfYvsJObVdneIksoPuiPT2v4+eTooiM0L4swrMLf7SPy7?= =?us-ascii?Q?8VApeQG3qWO6mmNeYQlE63DnFhaCvx/1m5w96pM19TsxEC+WBjZBNYg3/I9l?= =?us-ascii?Q?zPdL2S4NmN8iZozZ0HpWH7cTROwM5ZABBuECOmZzBX36ZFNVUIDSCFcsi0Js?= =?us-ascii?Q?HE9MURblTz3XtsECwn6swWG+nMy0y1XjFy0ITcQoEw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a698a129-70e2-4d53-565c-08dcaeb409fc X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2024 03:19:06.6403 (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: PUZPR06MB5747 Subject: [FFmpeg-devel] [PATCH 06/11] avcodec/vvcdec: do not zero frame mvf table 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/dec.c | 11 +++++++++++ libavcodec/vvc/mvs.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index 568229d2c3..be23f2bd54 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -159,6 +159,16 @@ static void min_pu_tl_init(TabList *l, VVCFrameContext *fc) TL_ADD(msf, pic_size_in_min_pu); TL_ADD(iaf, pic_size_in_min_pu); TL_ADD(mmi, pic_size_in_min_pu); +} + +static void min_pu_nz_tl_init(TabList *l, VVCFrameContext *fc) +{ + const VVCPPS *pps = fc->ps.pps; + const int pic_size_in_min_pu = pps ? pps->min_pu_width * pps->min_pu_height : 0; + const int changed = fc->tab.sz.pic_size_in_min_pu != pic_size_in_min_pu; + + tl_init(l, 0, changed); + TL_ADD(mvf, pic_size_in_min_pu); } @@ -302,6 +312,7 @@ static int frame_context_for_each_tl(VVCFrameContext *fc, int (*unary_fn)(TabLis min_cb_tl_init, min_cb_nz_tl_init, min_pu_tl_init, + min_pu_nz_tl_init, min_tu_tl_init, min_tu_nz_tl_init, pixel_buffer_nz_tl_init, diff --git a/libavcodec/vvc/mvs.c b/libavcodec/vvc/mvs.c index 905edf1cd0..fe047cfd5a 100644 --- a/libavcodec/vvc/mvs.c +++ b/libavcodec/vvc/mvs.c @@ -614,7 +614,7 @@ static int check_available(Neighbour *n, const VVCLocalContext *lc, const int ch if (!n->checked) { n->checked = 1; n->available = !sps->r->sps_entropy_coding_sync_enabled_flag || ((n->x >> sps->ctb_log2_size_y) <= (cu->x0 >> sps->ctb_log2_size_y)); - n->available &= cu->pred_mode == pred_flag_to_mode(TAB_MVF(n->x, n->y).pred_flag); + n->available &= is_available(fc, n->x, n->y) && cu->pred_mode == pred_flag_to_mode(TAB_MVF(n->x, n->y).pred_flag); if (check_mer) n->available &= !is_same_mer(fc, n->x, n->y, cu->x0, cu->y0); } -- 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".