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 33D0249498 for ; Sat, 10 Aug 2024 20:33:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0CF6F68DA75; Sat, 10 Aug 2024 23:33:42 +0300 (EEST) Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazolkn19010005.outbound.protection.outlook.com [52.103.43.5]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 901A568DA6E for ; Sat, 10 Aug 2024 23:33:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cHqSlFZIIY7QT/xmd/0c/7oY6QY14svS6r9YefqG3uMJTpbjEYL/nwYYan+9RGR8ohDFennfZLGp1piYZb0PrnBc3WX+9M/tZxy+azwCEuXH2T5wpRfMLz5UXbtkYUREZ9fm7fdQ+sk0LMgOfZ4I5ULp+5FoZlM91aFkdTQUqbd8ToxpPRsxj+PYDOazPkn81urK0fuMyjLD/gc9FcH+N90tmPltY6XviSMEobn9DF4ZxlUnLHEhOvHBp6Ty9aEsZz7FQgYuO4TH8clnqWftEYeWdB47kG4t0DrYTuF1lPriFaJhVDMaDROSn3jxzRFKU4BcI86VORBhE3SI9FlNWg== 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=IoFlbfBqkVAo7nzcXeM+GP7moJaO8uxopJMo5klZ5jY=; b=SNDiFGrYoRzttSjMMogUMI5tqf1IcJ9IafzaCszVWLTib146zqzQlb/asrO+2fUUa7Bt0jqTe8RKLcdTV878piWgDBJVU3bng9hgUWtWyZ6W16TmkvUkKNHIdqkMIJhq0vp4FFd53Mixf1xdE1oo+PGD+ai1HbVUK3D87TB9W7aVqs+e99E732lH4wlOmzCRp2qaQMqzA6Ni6Z4SUTnA6JqIxYVc8ytlJlSiRrj4KFdy6gn6GRbyr4jNt2FC4TQrmKQgONUgCkQ4qw+CT3fhc93Xc8FlsswoCptJSOAmo3A9+6cyPgoNLYpXcksDlK6WGzw2ilSOaLTiJC7oI2+WEw== 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=IoFlbfBqkVAo7nzcXeM+GP7moJaO8uxopJMo5klZ5jY=; b=PRZ5eWhNeZT3Tx+fe4EGuJYk5Wvw1woi8OUCOGnjOilvAOpS8hEN+TxdWAOEd3WYfkMBSp7nwb3sxMD3gGqAwHE6OREakTYc9kEMaURH7N1e2dgATTxHTdUCrCbcGxVoRUv1bcffaoUIr5LAh2hJCn0Ouuk+5rl0/Zvrp0CM+p8FP0VRJ73hm+DG60z2HOvcYarry7MuJnIyY4rTqXLnFIWA5UKk/S/dqodW+pR+alSsQM6BqcG3OI4lCvWbVAERfor9vB2elhhin9BYXe1UWby9gQC8ceMvq1aUd6yMpXwhMfqJcJgzl5402B1fk4Okq+5evjjumep29X5h2H2zgw== Received: from OS3PR01MB9944.jpnprd01.prod.outlook.com (2603:1096:604:1e0::10) by TYWPR01MB10016.jpnprd01.prod.outlook.com (2603:1096:400:1e0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.17; Sat, 10 Aug 2024 20:33:27 +0000 Received: from OS3PR01MB9944.jpnprd01.prod.outlook.com ([fe80::7b06:78cc:adb3:903c]) by OS3PR01MB9944.jpnprd01.prod.outlook.com ([fe80::7b06:78cc:adb3:903c%6]) with mapi id 15.20.7849.015; Sat, 10 Aug 2024 20:33:27 +0000 From: toqsxw@outlook.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2024 04:33:04 +0800 Message-ID: X-Mailer: git-send-email 2.44.0.windows.1 In-Reply-To: <20240810203304.1864-1-toqsxw@outlook.com> References: <20240810203304.1864-1-toqsxw@outlook.com> X-TMN: [8edf6XIYa8fhjrM4+1I+ofkSxw8IzGay] X-ClientProxiedBy: TYCP286CA0102.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::9) To OS3PR01MB9944.jpnprd01.prod.outlook.com (2603:1096:604:1e0::10) X-Microsoft-Original-Message-ID: <20240810203304.1864-3-toqsxw@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB9944:EE_|TYWPR01MB10016:EE_ X-MS-Office365-Filtering-Correlation-Id: c037c9a7-e56d-4026-81f9-08dcb97badb4 X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|15080799003|5072599009|461199028|8060799006|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: /h/Myum/BPq/q78HPpzGAcbICPSliHnPtha6XC8sUp9cTUdx/+vvm5GXN6f89Qv0KYbLXfpE/Vw39egp4VYW+xoK91iXQ42Fc5FiQXB/GudjnUYr9sfnD+TwksTUZv1eUDUB8u2mtUrd5rN+gqTJ0DHay0Lxhl8ux/DIjaaJJWGHRSQ/gAbXUuED8Zt178Wl8xa8vB/T7rEjsTEquxrXQ/terCoFCRoj0Xt1sBRnNJZego34MqPY0rs5xicr94Zeno8RRLkFUVoElH0kcm2uGRPWaeCm9v+ag0aI7RCsVmAbJlEJ6Fxs23w4vhl90bbE8bCpp9Rtiszt0b2QqFgLulbC/QIfkjgAQ8L0sP24Tw9gGBfp5dz3wCXr7jOFy6Bra3F4tyg3PzM3auXbxeQZL036zs13AL05PRjnVQAyO2NmZLz83hLf7ph98u/oLyqpAcZe09hWIwrnC3CH6qYaOdN/+ymB7VxP37dnJpxLNGqV/XuZH43DIKzCw3IumZLLZotCjI0GZifjt1lHPLn4la8kIIOn6UXA3j1uc6yhyUeBANbWYUN6y0nzB5PMfNIAgaH+VagwdCgm/sjUR13A2bnxwwxUxanWw2Hc0iKZ04x60gJLjdVyTDjESwcojG6tSOOE3UOI1sc0e59ZyuDdCTv/cJp0Jrd5w9GylorT5MZYEwoz8FYAUUDB6a04NgJlnkxd1JYk29SUSkKGDm96acJ/fLHcHH7Wb+6pPAG3Qz9uZdT9GWLaboIG21zwgF/AuNM2lXqI1XaQuQMDW4r/3l/FQy71gK8kVtKn1GTEg/U= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?u8HzcbO1Del9MCF1LGYOdLDh+oGc/4VUhIAzLp9ye4tfmzecf+IMRvVFtkJu?= =?us-ascii?Q?irnzS2VJ4Mg3XTpwq7ua2QkyUQx6TqCOutiZ862rEbBX55RCGE78I/fNvS9y?= =?us-ascii?Q?aUDv/fhbci9ztOZH86BZe5YIzyhuc1CnQtTqfaKRbpM27h/Med4IQ5rYYmD5?= =?us-ascii?Q?OfBJAqqGakxJZABVMT4EyRpQ3oY9ljaZVWnss+aRic64ljvoKNTG+4LekLWy?= =?us-ascii?Q?icAX8bENx1xKUppnymqwGuNXmrpPJo8vfObzl6qSdWOUv9xNW3n4TyDDHvRo?= =?us-ascii?Q?vGZn0U3sTbLFXw5C1bT8v9cEL36uTl8F2yG6nd/sduCzg2xPqiFuuOBC/+kh?= =?us-ascii?Q?5R4cor6dwz4sXkSCdwlEJvFSM6kXq1hS4x0T3WWxtrWjls6O7x5v9xZPdWOD?= =?us-ascii?Q?6sUlS/gOghNQvcTGv5HCq9dfG5hc41dJlzq/U1I7WBc+oZj2qZlLdM9/z9yV?= =?us-ascii?Q?L4FBHGJ0uE5zFUYIGxYjsA9Y7ZgGrZvjv9/+xqTaB5Ww7acXoa6atNYABSiS?= =?us-ascii?Q?8ndnABeuLU6Xvi5l84WWFj1Z1y3L1AM9k/HLq9RBC8deBYIZgOvC35mEjLui?= =?us-ascii?Q?SUsmgAR+wWBJakSCJjFowRrgzHyHlvBgUT5MOPb+YKHKwEp0lZDMKaQPP4yv?= =?us-ascii?Q?ruFPwGszOMA8QsixKGS12rm3yVfjjLvAIhCGFF5ha9usL6j66sKrzOVFX1zd?= =?us-ascii?Q?7i9fSqYEv09fgSpN+/kM4+sA4CqUB8tsk7rTt+QnYTIFkv/lXF/QwHiu3tAD?= =?us-ascii?Q?Amv/ggMdU4n4pIAxi5zLR2RWt1fs2X1dsirQknrUKHpEaUzjjqLAPf7gaDuM?= =?us-ascii?Q?ug6Xf6N44sDh7kAdguGF1dvEzR0cc520yUQw/lzzGg8BYEkVcK3eY2RjfBZa?= =?us-ascii?Q?8J3gSw5gPFdWPgygkObO7izWIhTFdBt3I522hcP9oYGy71FZsdVrFXzpQ5A0?= =?us-ascii?Q?HzbiUN7qJ2qA+tDCMnL77SD3VJ+UOZPpZtYvdKUEf5CoqRKpwq4ijU4dlMSL?= =?us-ascii?Q?7FlaarxZeYUgouxKA7VHXGKgkanv6wh7OXJUo5nBg+X41oLzSBr7b9Xhmyqe?= =?us-ascii?Q?24Sff6SzPM+7Ptb0UsFe5Ar8HQlKIuGS5mDcoTK9fr+p75FcrMNonf8rYI3K?= =?us-ascii?Q?tZNK9Se1ebvbel3ezR05OccDthxPPkRxWK7r423dl4aFqDQ9W56nt/n9pbfH?= =?us-ascii?Q?MGdTcbl/1hlFpqsIGsI90R2kfxgz4Z/eQwLw9XkGOJ6THcbpTYN5zraopbE?= =?us-ascii?Q?=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c037c9a7-e56d-4026-81f9-08dcb97badb4 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB9944.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2024 20:33:22.8327 (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: TYWPR01MB10016 Subject: [FFmpeg-devel] [PATCH v3 3/3] avcodec/vvc/dsp: prefix TxType and TxSize with VVC 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: Wu Jianhua 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: From: Wu Jianhua See https://patchwork.ffmpeg.org/project/ffmpeg/patch/TYSPR06MB64337C4A9ADF5312E6648543AA62A@TYSPR06MB6433.apcprd06.prod.outlook.com/#81892 Signed-off-by: Wu Jianhua --- libavcodec/vvc/dsp.h | 28 ++++++++++++++-------------- libavcodec/vvc/dsp_template.c | 2 +- libavcodec/vvc/intra.c | 26 +++++++++++++------------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/libavcodec/vvc/dsp.h b/libavcodec/vvc/dsp.h index 0b49b97021..38ff492a23 100644 --- a/libavcodec/vvc/dsp.h +++ b/libavcodec/vvc/dsp.h @@ -27,21 +27,21 @@ #include #include -enum TxType { - DCT2, - DST7, - DCT8, - N_TX_TYPE, +enum VVCTxType { + VVC_DCT2, + VVC_DST7, + VVC_DCT8, + VVC_N_TX_TYPE, }; -enum TxSize { - TX_SIZE_2, - TX_SIZE_4, - TX_SIZE_8, - TX_SIZE_16, - TX_SIZE_32, - TX_SIZE_64, - N_TX_SIZE, +enum VVCTxSize { + VVC_TX_SIZE_2, + VVC_TX_SIZE_4, + VVC_TX_SIZE_8, + VVC_TX_SIZE_16, + VVC_TX_SIZE_32, + VVC_TX_SIZE_64, + VVC_N_TX_SIZE, }; typedef struct VVCInterDSPContext { @@ -127,7 +127,7 @@ typedef struct VVCItxDSPContext { void (*add_residual_joint)(uint8_t *dst, const int *res, int width, int height, ptrdiff_t stride, int c_sign, int shift); void (*pred_residual_joint)(int *buf, int width, int height, int c_sign, int shift); - void (*itx[N_TX_TYPE][N_TX_SIZE])(int *coeffs, ptrdiff_t step, size_t nz); + void (*itx[VVC_N_TX_TYPE][VVC_N_TX_SIZE])(int *coeffs, ptrdiff_t step, size_t nz); void (*transform_bdpcm)(int *coeffs, int width, int height, int vertical, int log2_transform_range); } VVCItxDSPContext; diff --git a/libavcodec/vvc/dsp_template.c b/libavcodec/vvc/dsp_template.c index 8130abbccf..1aa1e027bd 100644 --- a/libavcodec/vvc/dsp_template.c +++ b/libavcodec/vvc/dsp_template.c @@ -97,7 +97,7 @@ static void FUNC(transform_bdpcm)(int *coeffs, const int width, const int height static void FUNC(ff_vvc_itx_dsp_init)(VVCItxDSPContext *const itx) { #define VVC_ITX(TYPE, type, s) \ - itx->itx[TYPE][TX_SIZE_##s] = ff_vvc_inv_##type##_##s; \ + itx->itx[VVC_##TYPE][VVC_##TX_SIZE_##s] = ff_vvc_inv_##type##_##s; \ #define VVC_ITX_COMMON(TYPE, type) \ VVC_ITX(TYPE, type, 4); \ diff --git a/libavcodec/vvc/intra.c b/libavcodec/vvc/intra.c index f77a012f09..73dca6dc85 100644 --- a/libavcodec/vvc/intra.c +++ b/libavcodec/vvc/intra.c @@ -128,15 +128,15 @@ static void ilfnst_transform(const VVCLocalContext *lc, TransformBlock *tb) } //part of 8.7.4 Transformation process for scaled transform coefficients -static void derive_transform_type(const VVCFrameContext *fc, const VVCLocalContext *lc, const TransformBlock *tb, enum TxType *trh, enum TxType *trv) +static void derive_transform_type(const VVCFrameContext *fc, const VVCLocalContext *lc, const TransformBlock *tb, enum VVCTxType *trh, enum VVCTxType *trv) { const CodingUnit *cu = lc->cu; - static const enum TxType mts_to_trh[] = {DCT2, DST7, DCT8, DST7, DCT8}; - static const enum TxType mts_to_trv[] = {DCT2, DST7, DST7, DCT8, DCT8}; + static const enum VVCTxType mts_to_trh[] = { VVC_DCT2, VVC_DST7, VVC_DCT8, VVC_DST7, VVC_DCT8 }; + static const enum VVCTxType mts_to_trv[] = { VVC_DCT2, VVC_DST7, VVC_DST7, VVC_DCT8, VVC_DCT8 }; const VVCSPS *sps = fc->ps.sps; int implicit_mts_enabled = 0; if (tb->c_idx || (cu->isp_split_type != ISP_NO_SPLIT && cu->lfnst_idx)) { - *trh = *trv = DCT2; + *trh = *trv = VVC_DCT2; return; } @@ -152,11 +152,11 @@ static void derive_transform_type(const VVCFrameContext *fc, const VVCLocalConte const int w = tb->tb_width; const int h = tb->tb_height; if (cu->sbt_flag) { - *trh = (cu->sbt_horizontal_flag || cu->sbt_pos_flag) ? DST7 : DCT8; - *trv = (!cu->sbt_horizontal_flag || cu->sbt_pos_flag) ? DST7 : DCT8; + *trh = (cu->sbt_horizontal_flag || cu->sbt_pos_flag) ? VVC_DST7 : VVC_DCT8; + *trv = (!cu->sbt_horizontal_flag || cu->sbt_pos_flag) ? VVC_DST7 : VVC_DCT8; } else { - *trh = (w >= 4 && w <= 16) ? DST7 : DCT2; - *trv = (h >= 4 && h <= 16) ? DST7 : DCT2; + *trh = (w >= 4 && w <= 16) ? VVC_DST7 : VVC_DCT2; + *trv = (h >= 4 && h <= 16) ? VVC_DST7 : VVC_DCT2; } return; } @@ -447,7 +447,7 @@ static void dequant(const VVCLocalContext *lc, const TransformUnit *tu, Transfor //transmatrix[0][0] #define DCT_A 64 -static void itx_2d(const VVCFrameContext *fc, TransformBlock *tb, const enum TxType trh, const enum TxType trv) +static void itx_2d(const VVCFrameContext *fc, TransformBlock *tb, const enum VVCTxType trh, const enum VVCTxType trv) { const VVCSPS *sps = fc->ps.sps; const int w = tb->tb_width; @@ -456,7 +456,7 @@ static void itx_2d(const VVCFrameContext *fc, TransformBlock *tb, const enum TxT const size_t nzh = tb->max_scan_y + 1; const int shift[] = { 7, 5 + sps->log2_transform_range - sps->bit_depth }; - if (w == h && nzw == 1 && nzh == 1 && trh == DCT2 && trv == DCT2) { + if (w == h && nzw == 1 && nzh == 1 && trh == VVC_DCT2 && trv == VVC_DCT2) { const int add[] = { 1 << (shift[0] - 1), 1 << (shift[1] - 1) }; const int t = (tb->coeffs[0] * DCT_A + add[0]) >> shift[0]; const int dc = (t * DCT_A + add[1]) >> shift[1]; @@ -476,7 +476,7 @@ static void itx_2d(const VVCFrameContext *fc, TransformBlock *tb, const enum TxT scale(tb->coeffs, tb->coeffs, w, h, shift[1]); } -static void itx_1d(const VVCFrameContext *fc, TransformBlock *tb, const enum TxType trh, const enum TxType trv) +static void itx_1d(const VVCFrameContext *fc, TransformBlock *tb, const enum VVCTxType trh, const enum VVCTxType trv) { const VVCSPS *sps = fc->ps.sps; const int w = tb->tb_width; @@ -484,7 +484,7 @@ static void itx_1d(const VVCFrameContext *fc, TransformBlock *tb, const enum TxT const size_t nzw = tb->max_scan_x + 1; const size_t nzh = tb->max_scan_y + 1; - if ((w > 1 && nzw == 1 && trh == DCT2) || (h > 1 && nzh == 1 && trv == DCT2)) { + if ((w > 1 && nzw == 1 && trh == VVC_DCT2) || (h > 1 && nzh == 1 && trv == VVC_DCT2)) { const int shift = 6 + sps->log2_transform_range - sps->bit_depth; const int add = 1 << (shift - 1); const int dc = (tb->coeffs[0] * DCT_A + add) >> shift; @@ -542,7 +542,7 @@ static void itransform(VVCLocalContext *lc, TransformUnit *tu, const int tu_idx, transform_bdpcm(tb, lc, cu); dequant(lc, tu, tb); if (!tb->ts) { - enum TxType trh, trv; + enum VVCTxType trh, trv; if (cu->apply_lfnst_flag[c_idx]) ilfnst_transform(lc, tb); -- 2.44.0.windows.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".