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 BD91D498EE for ; Thu, 22 Feb 2024 07:46:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D97CC68D1DB; Thu, 22 Feb 2024 09:46:52 +0200 (EET) Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01olkn2051.outbound.protection.outlook.com [40.92.52.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B335768CF9A for ; Thu, 22 Feb 2024 09:46:46 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KH7zYWBTNFiwyD6m2zC5A8MuLW0C1lgOJqY9WBPEtA2FJkflXDVm+dx1vdcbS4n0C4ksc92XlpxxMV9jQF3Dbw7drNK1npCJkuZ4Js8yQiRiwWImdiaN44N+tQcwy5V3ubMhfGP41eFD0OEh92f0Tvs0DyFXbkTBefcuADjWJ2pjtfYJ3tMLtuNYQjr/IP7T8fLQO5CAZd4wy2G+tg45iuxWLMC+9VWFiBNJ8wwTIgT1btDPvqHpxSM5iRhYGScEUJkfFhG68f+8BoN2WEsjxoKwNvxmHrtA+c5eWEiHUxiIGq6S0JFYqDle1crMC874V8LWRlesy2Z2qAU/lxsB/w== 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=4ZBhVAg3yO/Daeyo6LEiuGteIg2GOCU08LuB6Pf42XQ=; b=K+2petT/2ADn45E5FKojnCs9XZFk7oIWQGXR/eNtS2PwWnSazErbe21TOtg1M5Wy329b3qeeWKjuu4kijhkXCuURD76fTV/0KmIVP8XPeZgDwOtqxMy6KkNOEuh2+JI1roTm6GQ69+WcYPKVtaNZzYUjyNuo/sJyu6cKQPe7RxXyHsldsDIUGmJSGve55K9cQB77nxA38UVwa2LShVlY5kI3JyFjDII3HjCtE6ScWJDc7/PcxHf7RWqp54TtilyM/52/Lsu6GHLkNNHLZI1aQePe9R0qPsT2UJqxOG4p81TDO7NzqB5uGwUmehh7lP/NpxhSqUVErc9W8VQHMEOd7w== 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=4ZBhVAg3yO/Daeyo6LEiuGteIg2GOCU08LuB6Pf42XQ=; b=N6pmNQZCsDipdF9DMbFIbcUuH/Uw0/8JJwmgOBm4DJX2wYH6MWjDjFV0DCnpfkTBtEC8VHSnSLKinUcdeBVfMaoeezXBDb1qFqVqMg6tY0XdyIl0riqW5AzB1bsgbrybykBnofZZmreszhuEatHT1kH7Se5fZOSNnjEBnKVIMFVZe/5mwTFbGVbithwVzSqX8Q1IAhUrCDeT9Jn5JtX255kMdTVjajhylRSqbLweB4NxPwX8agEMM68CdZoi13bs1gc0XlOCJyFceA8b2hgpBV8IMOF5YfWkpc2eRuxAFahx2jQp88t992RdwE6lhuaeVcjJn+xmRgJ8760UHPPz3g== 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:48 +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:48 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Feb 2024 15:13:59 +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: [zkfkLUAdQa29ml5LGb4iCJUqItStTLMn] 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-5-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: 6109930e-3871-4ed3-bcd6-08dc3375f475 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cFBNqGb6y+yg+cPA0MLPNYNYBCtMA1tg2BbDvOFxFXHdCh4/Wph8zO8JhJUAxdIxT1Z560u20hWVoU1xDJTse8BuriR3EnOkQaUypW4JqJy8QHmlss3Fu7/KPsP7UC+pKZGoxm6QNW6BOKYxq6xCJ9sN5DHef/SFNFw47VnK8U8gJtmXgSP6ryC/V6XYf3GoBGFkb59wzMix6oBEdDboiHkMbH2vsBmfbsyzwXYX9h7QdruU3t6LxOVuFuxGlGzJZE8t5XIJUBkYBcJZadkgjt7ZiAaTL0IzQS8QW4YjKgX/x6enzk/QRnXIj5XdsmAZ2baSGlnTHH6CWfGAvVc+rndxaQNFwqNeaO+PK6RgHTh/uNVehIU4XqX8Z1sOtbbJx7Fh2b8uHj1Q+ZLEgs6qpIS77nB1qjPs3RH1i0EPp8YTCHo16AbGl+DEZu/y/XH28jDJZpdqCQsii4KKdcENKDwwaPvLbfOLwEGAGC2/Zpk1ncz5c5BwcGLefz+LbfP/nxqJ4DkR6BqQCBRMS4fgnuEyzCzHEHJ/TOGQ3omHr6+hx994bg4OyQFWpc8VsyTRanf6IRDgzOESDxZVT7cWxzxyOXolBg8tc3I3ltrqO7TzccqsTAlbPY/hJCIueSHT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QgR1RezHyJvqR9i4Prbctpf+0JdSfLDAv5KQldum4B2psI/oXXWLq/WfUzjK?= =?us-ascii?Q?sKMzgUjxMAt5TvZBmK9f81kZq+LFEn+Bt0dxILLZVduv/ZmyQpV+5LNVjWBz?= =?us-ascii?Q?NAehMN10qXhTnrXVonQ52jo/gPemDLdLhsmOq3CWNMmqXmnwArTG+tnewGHn?= =?us-ascii?Q?1QuSXRUJbyPeAQ/BL9SHjU33rrc04uXKYefEexnsTSGLSxTxiGPTTQwHmK48?= =?us-ascii?Q?pCKlwYMnYT7I/1Jw2gL48E+w8V/d0PFG2lxr78kRe1iYLAAZK9I07CQdVT2B?= =?us-ascii?Q?Mj5mG5Y7b1MmLAc/XLp17kWuf24eIxDF9t39OZxJ4yOzCuFKDXVyCxMv+S+7?= =?us-ascii?Q?VecgOq6cssUxmGvA0IHumCZ0RMvDxChuLpweaFSY+jnxOqy0TIsbPL3u7YxY?= =?us-ascii?Q?HtMz1FcW+DVsO+7gHzlUGY61WskB7BPR7wNkgZ0+iVbpAQUCDtJ9/l/PAozs?= =?us-ascii?Q?FCNMEXEE3fsLTGY/066jGyMHHWkndfuCvAEkfKIU9bdSGAbcTLFmBXb/kw/0?= =?us-ascii?Q?ESFZGDe8KOQRdyTBwsDo41fPPVnNWVtx6OpD0GAZjh+8TWNN6YUjPsanPsha?= =?us-ascii?Q?YlLucmslVlyYAgJT3TrZ7FZn0khErwnHNo+061y8kLNb/cLQLqpZbdNlYhQN?= =?us-ascii?Q?iVQzX/u8JDPZi6Ixwe8AlAgHJtNp+24XeOqgh2TIrvTcwerekBcXQi26JuPn?= =?us-ascii?Q?FulALOBdvswB8JxPed3rbMlXkRZJbfZH0xsxenc+LITlmppCFGrzIVAb/cTC?= =?us-ascii?Q?rpH+th5c+S+awa0UvvnHVycz6JGJp8s3MxFJAZLPxlllQIs3p4knKlube8Xc?= =?us-ascii?Q?ecB3iOfh8s7knrn6k9PR+bIVoVveShN3vGc305n9euunWSXblpGRgPy+bQQY?= =?us-ascii?Q?jto/VnTzGSqG2fAqEw/Ph6X1APfrmx5DNpJFO1MFYO0HWUeeipYNJBFtgbvU?= =?us-ascii?Q?3a/X4BmjGi4e9/Zjy6XeGUISNgTcNev1AcAJE3UFVMH4e6LmT7HKtWh11hYr?= =?us-ascii?Q?pXJeZgs6ubzAb83xbS8wnaVFehDzneNAkgyvt6Lq92yaw3BbIXhDHxA7aNhK?= =?us-ascii?Q?/jElQnqCX/tr5i2y5LI1gxqbOhS7jRWZXVzR+T3bJH2PJwDKr5Rn3epC2rNj?= =?us-ascii?Q?gSb0T6N+pcZQFt5n4v8RliQP9aZbGeLga3V1Un20X9isJIDwxlY5gkRb4Rcu?= =?us-ascii?Q?L9HQQwYjmR2TlKDEu4xXhEx99t/VsqmlZc7HJErmEdFBgMrEGOkchYfmvoQl?= =?us-ascii?Q?NpBe09x3QmSfnwc5tshr43hB2SK1cjPO8Cgh1G8CMA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6109930e-3871-4ed3-bcd6-08dc3375f475 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:48.8129 (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 04/11] avcodec/vvcdec: cabac, fix non_inter_flag, pred_mode_flag, amvr_shift for IBC 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/vvc_cabac.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/vvc/vvc_cabac.c b/libavcodec/vvc/vvc_cabac.c index 4342dfc342..5e24a1b677 100644 --- a/libavcodec/vvc/vvc_cabac.c +++ b/libavcodec/vvc/vvc_cabac.c @@ -1196,10 +1196,10 @@ VVCSplitMode ff_vvc_split_mode(VVCLocalContext *lc, const int x0, const int y0, int ff_vvc_non_inter_flag(VVCLocalContext *lc, const int x0, const int y0, const int ch_type) { const VVCFrameContext *fc = lc->fc; - uint8_t inc, left = 0, top = 0; + uint8_t inc, left = MODE_INTER, top = MODE_INTER; get_left_top(lc, &left, &top, x0, y0, fc->tab.cpm[ch_type], fc->tab.cpm[ch_type]); - inc = left || top; + inc = left == MODE_INTRA || top == MODE_INTRA; return GET_CABAC(NON_INTER_FLAG + inc); } @@ -1207,10 +1207,10 @@ int ff_vvc_pred_mode_flag(VVCLocalContext *lc, const int is_chroma) { const VVCFrameContext *fc = lc->fc; const CodingUnit *cu = lc->cu; - uint8_t inc, left = 0, top = 0; + uint8_t inc, left = MODE_INTER, top = MODE_INTER; get_left_top(lc, &left, &top, cu->x0, cu->y0, fc->tab.cpm[is_chroma], fc->tab.cpm[is_chroma]); - inc = left || top; + inc = left == MODE_INTRA || top == MODE_INTRA; return GET_CABAC(PRED_MODE_FLAG + inc); } @@ -1569,7 +1569,7 @@ int ff_vvc_amvr_shift(VVCLocalContext *lc, const int inter_affine_flag, { int amvr_shift = 2; if (has_amvr_flag) { - if (amvr_flag(lc, inter_affine_flag)) { + if (pred_mode == MODE_IBC || amvr_flag(lc, inter_affine_flag)) { int idx; if (inter_affine_flag) { idx = amvr_precision_idx(lc, 2, 1); -- 2.25.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".