From patchwork Thu Feb 22 07:13:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 46431 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp173649pze; Wed, 21 Feb 2024 23:15:17 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXt03I/JD/dfIXxP2ne+e2x7uHJex6LpTzgpo911LgC3nS92DX8BREfxLDyWldukd4uC/BwbQ5g1wKDZACK9Kv4/wkwA7nLUPn5EQ== X-Google-Smtp-Source: AGHT+IG9+el1PGma9NJd/RjOUUjsAPNMDSc1MPdp4eVO3Zr2fJGO9MSUYtPShZLU7UHuhVBjYIux X-Received: by 2002:a05:6402:214a:b0:563:bd95:4e8b with SMTP id bq10-20020a056402214a00b00563bd954e8bmr10720166edb.11.1708586116927; Wed, 21 Feb 2024 23:15:16 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v14-20020a056402184e00b0056289a3709fsi4942419edy.380.2024.02.21.23.15.16; Wed, 21 Feb 2024 23:15:16 -0800 (PST) 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=YXFKJDme; 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 F313E68D1DB; Thu, 22 Feb 2024 09:15:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2011.outbound.protection.outlook.com [40.92.53.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB51F68D170 for ; Thu, 22 Feb 2024 09:14:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bs7jaEzba4L66rQq/ac2nRzXiUY1UZozomsoVxUvvrZB8COq8n4F7bPhRdtFxHMqqKJ+GaJGk3O01dULW7usQ7vLQqAgOXsPr7q8yPGpbuohWkmkfaaci7nRv4gwmJyrWKC5lrhDv24WAzVEOwYoe+2DelVrVNAeKQ3fCPFHaZSi+97yTpKHorSNJWmjFrtqtgIKSfBb6rgOU7whpmBflKJmc0D+604qgJ36mAMrpLlJic9mXo6PJ4YJfbg+tl00loHkB7L9/ld8qV1ugKl9x7ezAF6fh/v5M0rD9wtHiKl3mkY7QRscZkK5HUCzJteLUF22WOrWE8KEXkh7frZm3A== 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=27fGOxi9vMOu3/x2KQEAtzdC0EQAgV9Xqri5jdTa4SI=; b=L8sx2CYMI7tHSwYaNWG+0NwqHaI2vXzbtnqf4j5bUfdfqDpX3Wo0QbkniX7usQLSgiKng81hB9XxFw3VOCn66efSFAMjI1Y/mrO5hfhB6XIabvfLYz8l3cY8ye60Lm17jHPnYHwAtaqIlkuWpkmEfEpAjvt3zR+HM6QFfAPTTmVbU4G/+ppVmao13xdJiFGr1FBwQC/F4TcpjLLFJVSp0KOiwKyT7tn9JEidnUGdR3evgyUBq33dJSfdqk6CjN4AVszoF2hPTJk+S2mxUG7YpK88o/5DZJfbNkfbnTROuh+jRW0ZfCCQpgNw8+6ZT2CjXHaCUjOkRW+Xy41q/4V2AQ== 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=27fGOxi9vMOu3/x2KQEAtzdC0EQAgV9Xqri5jdTa4SI=; b=YXFKJDmeFCERX/KLCdfU9n9rz9fmPhWtfS20MWVudaSrVQ0NatLiKUGbnT3g8uSpKYzrqqKhjuaNDsSurJdXpFNwJkNdQWff6K9/bZ7dsEhU5ExLazyujmbCoseQ9rtjfUConPjo593aNBBMyKtXadBwW69jTigV0NJpIyjTNsrNH+mVVgyU/Af18cqXqqBdmWry6OPJ1vJKOceM2FktE4KzkXa5fipfliKKo+joJt0fLuEjopvu16TIuDKUU5cFRrozJBI8fRbDNeImqXQRpnYTfoODiCEVEPM2dYUxqwLigkQLkpxyqznMlDAD7sQ7INI25YKyJkQdC4aEyfmiDA== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYUPR06MB6241.apcprd06.prod.outlook.com (2603:1096:400:358::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.38; Thu, 22 Feb 2024 07:14:47 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::e139:fd7a:1b66:a3f7]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::e139:fd7a:1b66:a3f7%7]) with mapi id 15.20.7292.036; Thu, 22 Feb 2024 07:14:47 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Feb 2024 15:13:57 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240222071406.5714-1-nuomi2021@gmail.com> References: <20240222071406.5714-1-nuomi2021@gmail.com> X-TMN: [VK985aasUKAY7OW0ABHRm/sfNmQv7Gpu] X-ClientProxiedBy: TYCP286CA0049.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::7) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240222071406.5714-3-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYUPR06MB6241:EE_ X-MS-Office365-Filtering-Correlation-Id: f9dba4ff-9b2a-4a0a-0a55-08dc3375f375 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W1SGJi7itmdFvSbN+2bvkYu4dDKegpkVP6HD/MmNJR/Qe3+S1NlJLw83HtKn7kP6IjgC/9pgfjv/uySsnXNM+r8HoWUU51ehJclcbYXP12Mp6ljaUagWcuc4ONR1b/3J4N442bEkVDOaZkbFNkA6OzITSH7bK+4d02WsxG+r1Sh2rkzcBAIG8OEkZHwh27R0cacpnGiWZgIoMzbl8ZMtA7Wg6+W1isu/n9gB4GWcIKuy6QCx/wv63D5ntcI8UXUsmibaDLesOdufkijcXa2uoSoJHxPsXdyhdwzrGmNk45XnOR5S1Svd2+J9V6kXsxvD5/xCRsGcOfO/vA4AdJdrfEtiGpmIguNWzCT4a1+L0LwZuvhUx+6eKq5aGch0YRK3UZf+Rnl/EGCZpnGk1t3s67xY+j5eFkl/hwPC0vH4m2bDbmVzUFSCYElMZsvCOz7Nud7YYrtufyG9oaiTgF/3mxLfNV+Ve/xPi4+3LrvQKuhFT8fg2qjCBshEEyUTXX6tkzdXn4mrf/x50KCupfp9BFvLcxzUgbRJO98f0TP5WFfbT6sxJojSxsqQIlXRirHxG+74qifuUk7mBWc9f9YQp3yNYULGnf0Dcy+4Mcoykps62CnyeEFdbH3pAjN+D9p9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8bBlC8snUcSJ0ae3rYoBFGPvhU73ur47EqggU3FBZ9sE9pYS94GulQmK1zQ1ahpbl0GQCBDLZr4dmaVxiAMrkgIzF04SeFcAJjd+x0DLfx/rxQQZfuJv65LA80EDwqq5+TLRDYT01L4O+Aojxo9HdXWIxlhH1gvn6n6yOp2Dugc5/f0z8UiYMD5oiuSuFmG9Z1ERqsirNOWckVjqb9z+QkvXiKnOA4OKe6l+giiBJpKW5MhfLs15uxC+DKyRRd3Sn79pDfiPuAnRBnXJdXVcbQpPFV/5DdIr5spYQ5GTcsoDnXpOOo/spu6P7h/+PEAwROMF3wAAn7l6pMa6Re/ixGPBPYjKM2FBSB699DePxKBGBNVwh3NB5VXz3MoHl08JGbT2yrnxa90uK6aCiUqsowhv67feoXx/1cqZe5wjwPU1rQRbUooSUStcMnTsRtFbUwJFTHuV7v5aJ8/7/Ry91gTYUVdjKI+WejZvWZ0AOjaTMtEHM27iZy+n36xw4uPSMA4cJxCUrdWggfbKOfpNhTqA7graQcGvrYPAv8DyRppVNEywI5JTzmRu6+3eSs4OT/bl0jPd1PqSBM87wZsSUah3hXj467ZseiRNow2vbqrwxwL8jQpfbNdFevaaNAv3RK3fcqlbaTTSCKwe0tCZoTXeo6QTo65W4pec9PMIdvYCQBWJbWM6gkTE6GwSgD3xi3bsGkbhXSO/KI3EtiOyT8NzkMZDnB2vCrcrQ+qjrX/8oFUwa8gXu824+Q+6rafio8FRKlaGD0JlQCXkZIO03yjjhj7CFVWU12bBy4Xpb4kyjvlDuV1mmnNoDN6Q0d3LzB7xfs5oeWsvhzubrxpYg+dE7XvSbARgrCIVHbr3ibLhhLV0RrOjw1gk5s6zcn1E6WHiBQHKngqSDaehQ4wgtsayXDlaBmyfrO2PVtUdj+hJpKk5Lw2HMe42hacR0HVpjhSD9aMreCRSmnSi1maLO+CaMq1ad1sz4XIZE0YyLU2zRY5XBEGe6IAQ6HtpmoKtgjpNuWHsEcLnrBvrl6uSFD1MkyKgnmxzhZIo1/htXMDYfE5qa0a3MNj+NpSlMuMxcTEHUVhvbJ9+DdRTE0lPDmBvmwx2fIBcwi8kJoJvcKX7PtWuCyB5DZ1iQGJrUwHlTyr+Y0U2O9XtD4vDs69z59SGSSdfWkZ1EUAhsUyg18s/HgK7TLq3FE7Ws40VJHw3sRIC5jL8HsoIOh+9Y/Bm2eO+Xp9xc/vArOCdXDZzDDbtMmYUEccbzvQVempIfyBKaT4NS87Mlepb4J2hN+6W3Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9dba4ff-9b2a-4a0a-0a55-08dc3375f375 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2024 07:14:47.1610 (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: TYUPR06MB6241 Subject: [FFmpeg-devel] [PATCH 02/11] avcodec/vvcdec: set CuPredMode table for chroma 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: 31OiJ+QPcqyw follow the spec --- libavcodec/vvc/vvc_ctu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/vvc/vvc_ctu.c b/libavcodec/vvc/vvc_ctu.c index 36f98f5f2b..2e48f7bed8 100644 --- a/libavcodec/vvc/vvc_ctu.c +++ b/libavcodec/vvc/vvc_ctu.c @@ -1227,9 +1227,12 @@ static void set_cu_tabs(const VVCLocalContext *lc, const CodingUnit *cu) const VVCFrameContext *fc = lc->fc; const TransformUnit *tu = cu->tus.head; - set_cb_tab(lc, fc->tab.cpm[cu->ch_type], cu->pred_mode); - if (cu->tree_type != DUAL_TREE_CHROMA) + if (cu->tree_type != DUAL_TREE_CHROMA) { + set_cb_tab(lc, fc->tab.cpm[LUMA], cu->pred_mode); 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++) {