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 159014B0B4 for ; Sun, 28 Jul 2024 03:20:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2041A68D7F5; Sun, 28 Jul 2024 06:19:26 +0300 (EEST) Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2107.outbound.protection.outlook.com [40.92.53.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1062D68D76A for ; Sun, 28 Jul 2024 06:19:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LC1+RRCFE06sRUDVDQXHul8UA6QkfYjaqzcHdPMdfE57xOcScCekkaMLjPyVBP0DqxE0kQNDRygg5QHzo+/Sr/LtVCUhSdxrfWRTW+OW4znn6nlNvSupoENuwyaHcw4AQQaZ/tTJu6BiBIKZmMiSVj57DWmWZ52FZAIiAz09oBrSq9jNOLqNWtnC7nZteui8M/qpLsfv08h1zdyQ1Ne4AJVAfc3WX9JyyLAyd0oU18ES6J10oWP/uhNS8eWOx+uUWEYWOtFMYc5tQnT1qskrTiioRbIPd7gafi4gFVa9RO3b9dSGMopwZBWEbHXNBZT0N9RpSrdz9//igUQV0ttfTg== 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=ayx43CWqNIlE42S997N1HVQghxFCB+WYlbvOAMJXVkE=; b=vj7Ua/+v34AY66QEzXC/DJ2mFzm7FoyJRurFdS7sh2NSV3RIM91Ey0Z9O8aD2ZibnoqDHT/5PZyP9sLAmfIx26OwlB28ExovIK16CQy0I4GO89IwZbxCk8CI4g0sgK/JGYmpMrsGSzFx9c67wKoiOLBeulFpCXDLJ46aLGXn+r+IM96ohP7UlMc90yuThXVBVYSFBg9JZ1CULcs2+3Slko1bGhideBUPimYXA/voFHQ61LzKxc7XbeBHV5a4oOn5BO2XrLkpGyDCk/oeWOrGu9FrMDjKGQkCqaS+v71xhjVfDlMaW14NxjIL3rZH1PykvKZRN4ZAGHbpbzwLZO223A== 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=ayx43CWqNIlE42S997N1HVQghxFCB+WYlbvOAMJXVkE=; b=ms9FHAy09Vl2OfJMIQf4/WDGyMJ0WbZ7khoqr9nhKwqF/CYa92ELm4aEvJOpsKA5AmWmhOTR4lHiq3Y92chvtLz3C6uBM5iJ3yOS1ie8KQ/nlehMeyvwG3urdFSYqwzz7FiG3/RzO5Cp56co7JlHPcmTDwXaMv0cDwB5dj2hr1eutwUXyCWn8s2occvKFDM2gIwEmWAg+NRhTdsuwz+P3F+kQ198UAU6yP0Zy7wWqGdbudguL8qkkK+7/wfhqo8NFh87ySCOwtBexRLobNrktqjTsMKJ4/zGV9QU1eGSeccA/vcbfwdqXndHDjsw299KanpBiWhXmuSAIc7/wrl8Tg== 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:08 +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:08 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 11:18:04 +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: [MKXVBEihZPp/AtsWJXm982AZ/vtF4EVD] 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-8-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: 60ba212b-8254-4ec1-8166-08dcaeb40b0c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|5072599006|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: VF/Y39NAT/rjSx4qeM0Nz+2m05O9i7Cyx0Y6IX//fofjCm5OhwYmhTekOR08cAaFSqlpXys32V+1gWtx4mMGnwUWT3OP71RA8+6y0+dJNHVFVtHMBtxd5Jjp0tPYZdnBeaJGf1K30AQRqOU+p/nPo7kL5/x+XGICJE3QlJALBPfT/rGv9gNMmWI62ibRQZS4ej+ZAznn9n6Lf4c5TqUdIycEAsT15ORAfQwgSJTgF57vy0A0zLVq8idSlwlo3xjocYTlOZRHkJfHCiJe9WKVpbzOuwz5dXXUttn3aKe7DPkRsDJ/X7ASp/Rb1f9SKfQXPEVFlB1D/rSjh6My5dJptsAbXzPbCbihFqpCeZT+Mywu2CJ5IpX0vG4+vFpV3ThturSGLWcXbakE/ly0f8+REJovkzJkcx4IP82nsEk8MRZ20UQ1J9NtvHJ5+wOVDrpKvr2rTSb8lFljIcTDr1Mn2qAkcZIau3qadpDQMmDcO7vUgAHpnXtOEP2P/bL+aJnNOUQCtuV3wsVqcPPkyF1PuT7d4BneoRQTFawWND/fkwQtolO8Aealu8CX3b29fjw9cJUhIEP4bdpt6kAR5nS6EuWQl2+w/73sk2qRn8p9PX1Zsu7yMxEfMAmGnQ2nZhUX0v13fDA/+oC77HITfN8egc4hLLSc2Gf/9H7q9N2IUTFLHmNVy6mltLz2HQYCH7ac/7NcitMvsNSps6M/dkwrEQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?p7vZd9KwBOZ6NfdbKB07RFCO97mWc0s8eAE1cehKdQ+sMtJCkGRsBVgee5N7?= =?us-ascii?Q?b4pZc6hjybv4ZP6dicOoFoGQ1AUozoCGxa+Agq7rNAFHGUbCJFm5xePDdMqb?= =?us-ascii?Q?AS//W8jiiXhU9JiLxZocVHu7B0UOczyrG8OJvYWu594oWUAnz2qU1cQtHHFm?= =?us-ascii?Q?d0VgnEmvTI34p3ZWoTJawv/b9wPRYQaWT9ige5N88eja4nzCodU/uWKuIq5w?= =?us-ascii?Q?B/qfAvifAF5HsZC+xSaz/4Oqq4JH8Cjdkdgzrjgd6ZdXUZpMklq+eonFZ0af?= =?us-ascii?Q?P0dKPlSn83hcWnqFghHlWvVoUaTZ0tV1M/zbT/UJykDQrIVvlZAcNF2T6AbI?= =?us-ascii?Q?5JXbRWrlTgW8a+dThRN4e969ifk5DBOuNtzMqy8LQLZcI1j+eM9/ZYYiJ+AK?= =?us-ascii?Q?sJW19TRK/9MEn2Aio/KbjPLbSIIekWFkzdc2fn+hCcmgEoJzqUWehDfm0vn5?= =?us-ascii?Q?OAM7BMjHHiQ1Aim0o4YLjoE/qbi3mAbU/7DReiWoYP3pN0XtmrdPD7SEGLvv?= =?us-ascii?Q?sIEP1Euxh7LTJCJUWDhDnoO7EZdxgK2H/GwI7CIQMAzxDCKUidOVbQS2q6Wc?= =?us-ascii?Q?5xjQuLCFyr5mdXo5gpGJhAlVZiz6N/5ixbM3+QrzBchmqMa5cRkvbVrQpMNB?= =?us-ascii?Q?Jf2Hv3GFo93iWgrVdzPO8zzw5+U/ss8+e941z+C47XD/Q9P6ALo/BjiT9CO7?= =?us-ascii?Q?DBTFEelOtS7pK4HpCE7a/R3e7aBPOq1mx+COKHzpAJhSXpuaBRowe5mlN3k7?= =?us-ascii?Q?EEccAyvBnqjbLagCE+C+XFyQ/SpIC0eZoXPCssgw+FNs/bFZ/fdGD2H5CC2Y?= =?us-ascii?Q?Xnbqyqcy5vYVegoF5NgDzxdzwJxCQmg348NKpmoL7oUOBnPBmFg7kkKM978j?= =?us-ascii?Q?usoE6l0601F6CerWIxCdeC5mQPJn8zd5D8mUmETJr3ljXvClbWemBR6iDWbC?= =?us-ascii?Q?KWOzeOz7MH6OugxzkRJixhSiyEitPrYcC1ucq3zvC0mcKVtqYFa2zOO08JHi?= =?us-ascii?Q?ODTkZzghDIdPfiW6UxvcC90FqZOa+emk9JJ+7R9qj2uwlvb2wO4L6hGCWiMB?= =?us-ascii?Q?9rPTfu08oNbc+DEgVLW4tgXO+R18F/Jpss8X9USA5MnXHPaS8NksVZhec4py?= =?us-ascii?Q?jLcU4MNLxtn3/z+z1nXWbWwlj0qh5kFMAFLJ4VNuHK8gWsnDD9PHPAmbV1J9?= =?us-ascii?Q?8oXhk8lECOPZNba8e2zY+GKj94yiy94irgigXxnCv/y9IGdmwA4GybyfqwIs?= =?us-ascii?Q?Uy08VcKIZ2PpLymzYwaZ9LEddEYEhfh23xpNwVmRAA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 60ba212b-8254-4ec1-8166-08dcaeb40b0c 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:08.4255 (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 08/11] avcodec/vvcdec: do not zero frame cpm 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/ctu.c | 15 ++++++++------- libavcodec/vvc/dec.c | 5 ++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c index d39dd579ae..579337759f 100644 --- a/libavcodec/vvc/ctu.c +++ b/libavcodec/vvc/ctu.c @@ -1080,10 +1080,15 @@ static PredMode pred_mode_decode(VVCLocalContext *lc, } if (pred_mode_ibc_flag) pred_mode = MODE_IBC; - return pred_mode; } else { - return MODE_INTRA; + pred_mode = MODE_INTRA; } + + set_cb_tab(lc, fc->tab.cpm[cu->ch_type], pred_mode); + if (tree_type == SINGLE_TREE) + set_cb_tab(lc, fc->tab.cpm[CHROMA], pred_mode); + + return pred_mode; } static void sbt_info(VVCLocalContext *lc, const VVCSPS *sps) @@ -1232,12 +1237,8 @@ static void set_cu_tabs(const VVCLocalContext *lc, const CodingUnit *cu) const VVCFrameContext *fc = lc->fc; const TransformUnit *tu = cu->tus.head; - if (cu->tree_type != DUAL_TREE_CHROMA) { - set_cb_tab(lc, fc->tab.cpm[LUMA], cu->pred_mode); + if (cu->tree_type != DUAL_TREE_CHROMA) set_cb_tab(lc, fc->tab.skip, cu->skip_flag); - } - if (fc->ps.sps->r->sps_chroma_format_idc && cu->tree_type != DUAL_TREE_LUMA) - set_cb_tab(lc, fc->tab.cpm[CHROMA], cu->pred_mode); while (tu) { for (int j = 0; j < tu->nb_tbs; j++) { diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index be23f2bd54..e078f9387b 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -121,10 +121,8 @@ static void min_cb_tl_init(TabList *l, VVCFrameContext *fc) TL_ADD(imf, pic_size_in_min_cb); TL_ADD(imm, pic_size_in_min_cb); - for (int i = LUMA; i <= CHROMA; i++) { + for (int i = LUMA; i <= CHROMA; i++) TL_ADD(cb_width[i], pic_size_in_min_cb); //is_a0_available requires this - TL_ADD(cpm[i], pic_size_in_min_cb); - }; } static void min_cb_nz_tl_init(TabList *l, VVCFrameContext *fc) @@ -145,6 +143,7 @@ static void min_cb_nz_tl_init(TabList *l, VVCFrameContext *fc) TL_ADD(cb_pos_y[i], pic_size_in_min_cb); TL_ADD(cb_height[i], pic_size_in_min_cb); TL_ADD(cp_mv[i], pic_size_in_min_cb * MAX_CONTROL_POINTS); + TL_ADD(cpm[i], pic_size_in_min_cb); } } -- 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".