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 1D18A49735 for ; Sun, 18 Feb 2024 19:29:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B27868D391; Sun, 18 Feb 2024 21:29:29 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2107.outbound.protection.outlook.com [40.92.90.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D7BB68D384 for ; Sun, 18 Feb 2024 21:29:23 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MHdQOxocOMAabrqDNj9AhQK/zpk1G7j7krvTSwfUJrRYs0/xOqexNNhFFFyRyPRiJM2SWwgiUbQNOZE0WTwfdrDY6m55f7CwjG+/TGQwNYMPAY3USTIUDpHkgTtPxJAfsgyzjTawSK6rM6OYXFB5pUzs1s2/Gxr/rtltDZuRHGMUJOrRrXdwe7lX+6Ac9eS5zLO3qoykdtopb22Wu7PUMD2xREbF2y8Xc374Qmhf2J3rqxLfY7NICkHvpqBZzeE5L7HATb9ic/38x+CIPmGThd2P4ZTGLn4kkW+dhB+Q31FPvNQZeY+54N//26ts+Ub7ssupUihG/BzUaolbURmoQA== 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=Y6+V51Ml23+fs8lvhQIwwRa1dd0kcFq17APVVqWupkM=; b=SsmYMZEJLtG6fcLgCdFqQnxr6NhJp62v8kQjumJJSkEWuYvAsVn5NjMoTsUUkeWiPfQy1zaEoTmxrTkXU+dcTiHGhaM8rGygIq8v0oWSsfr0CbQ3UnaE377M+IPLBxSytAWj5yVyUzLc/Rcw1OQgk0vkW3L6QFQTh9WDiw2Xrzoc0G0DYpboH+Qv0/IlaS1x08MiU16a4p8dyPIlL6xvUIUz0Sc6qKAwkF3EtkHlgijiTMrrjCZxYiaDfL6ckGVjXKc6gqXCd4N0i3xeQRRkblCnlfIOdo5m5636Wu6xbY14mi29FoHxnd3M4ObWUAs2ObYPI4BjZBzlshMTMO3QcA== 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=Y6+V51Ml23+fs8lvhQIwwRa1dd0kcFq17APVVqWupkM=; b=k9qiLGWugATAFvqAornLZZbtekIZ9g5q+rohR4kWh9YHCW2K/A9L3QjZeaveeEd7PF8UcaLzQ3uX5dQxto1Vn38xnQSdh3aFWtXA9Teu/EaawFTw40rUkGrrz6zPCmH535O3D7xIlL05Di//fq3FHUsEa3EsNACfdROjLLiHzoWQt5vVsUNH4aS7T4y4hUvQEkMX/4WieyPsrIqDTDOyiVvsYqcu+iQTJ7Hc2t4+KbAQ1IAyUzJmgzqvVK5aUd1jODErV1yKY4hzHRuFdheP6Sxuy0uMKwZ3GIpEQoN0Y1Q0gZeCvS+I/aKf0mCA3JUBpdjfJ++C1h8FHMLDuAvRLQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0405.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4ad::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.37; Sun, 18 Feb 2024 19:29:16 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7292.033; Sun, 18 Feb 2024 19:29:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Feb 2024 20:31:05 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ozVCUZkaPQlwd4TI6K+qDyX3ELkQouefvN8FYWfgu6E=] X-ClientProxiedBy: ZR0P278CA0209.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::26) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240218193106.346214-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0405:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f4ebbb3-5ea8-49fb-487a-08dc30b7e562 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ycplNZMa2C7SlgN+gUhcvHYJ0xiaF+tn1D+/34qMv/u2dTFKMyxkjTBHsb80nsmUpDPsDd+72+/P6DQikFo/GAYofj04X6pZ3j01V4o93nVp4TAAXiW6yqNg23Yk0wAw5C8EQd1dOc5pYbvCuNzdMK4xCCO8lcmeQ+0VKhkTm6h3gNHMMOrsX/zOKVPzup4ke6Pm+V4edudbGJYmZN5WYqtHxJcARkMu23JzkE1db1jxkBUwqzy7Ar6zVVTpBwyRYdOnz1gcFs4hhIiDlHiC3dCrNXk9yyiiTBhgUJ8MFeIjiV1khe8zVGTU3cG01Knbb5BvwxobYVM3M9SNnDYW9TbXGuDiJlVvuGCOE+CzTTM2J/fUPElfCbshUr30jaYMqeGrX35bSQYK9/p0tHlD05iqJ2w0nGU2xmZSPN9Z6wSPQCYwvGWiW3proDDZZ+0kj6vSUt0blTETxb9tF2hGMxh72GkqwMV1UM9SvtCnMQ6mYNqHQQ0foqWTnHFGu9nD+YMmpu5fe91fX1PboRYJLhC4pFunpWpkzWzAV0lORlJtaUIMbfvcWAwE9tJUvlI8R7pM4oa4o/YGtf6bkYqlV4sHrE8j735xdLTtJEoPLHRnrg25lJLn6objxOA41gYl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?k9BZcekrRuKTXaClxtQYOJGCiLH7dlwivv5XvnMy58ihftcMRcpdCvE3YuHN?= =?us-ascii?Q?if39vsha6di+Z5s4xi0J6ISAntUzITF5Oab05WOjDXdHL2/2AGaLnY4Blyd8?= =?us-ascii?Q?8p98igjW/2YptIHs2iikHVqKHlhbDWpwmXfMbfpq3M/EZMwKKtswzqoISTc0?= =?us-ascii?Q?banTVzHfNgtreUBAMK3FQ0nnFxWid1xf0JPxFwlk8fMPC4lBOu9dMfGMbzfF?= =?us-ascii?Q?XcmaZMPZvvq+y9fao5GsQuacf280iaoyFcGo++I+4VjsqV3anKg7rBC5tcsm?= =?us-ascii?Q?OBn8EO3yBvpjALG6mCl6pxSxA2URCsr42mCtY0igOIY0R4BHxkA0KxJdGTOi?= =?us-ascii?Q?KyB/XO50K6utU9q/H9fhcTcWdtpROLHj0wZzT3McWuWFBHLY+AB0w72ldVMK?= =?us-ascii?Q?1lg8VMyv0EjswgXlndrH8gZA3xpL6eLBZFbX00C+Nd0Y1XF/nQ/yeS1Pk8g3?= =?us-ascii?Q?q0AUKdXH7kXOhzMZ1WiedMM6RyEbenq/Q1Jns5d2ZXFS5Yp2UwuGrk9RZV55?= =?us-ascii?Q?u0CoaqnHUeSG+ByuLNAmrsSxbC39NxF8PynzTm5INlYqhLCSa1sB4Q00zE6c?= =?us-ascii?Q?9s3BkVsKTVGTs9rJjX5B0DvXiJYCohHDTiz6sLvEUzD+2jIa7DNPC0CwP4nI?= =?us-ascii?Q?rQADX/jU07VY5l+P88Zoin2XoPDkqd9F5yt3paNqcKJN40WsE/XRY2jq6vxP?= =?us-ascii?Q?wOLbya74SBnrqeP/N+mpdN47W1jvB/kUr/5yRcOdaoBZ7fbBBZcdrgszTwcq?= =?us-ascii?Q?UzeTqGMEVeF5fU1jqK6u5aNT6fUmQx8yHEVRqEawyRWL1auP8tZhF61O0pBu?= =?us-ascii?Q?0srFxIPcf844gLaYSNuUF53trqZbi44gOPiBMWykbyQJX/cXHizVFfBFQi8Z?= =?us-ascii?Q?WbgdStshwGe8Lb3hduPpRBrz0KgC9+hNU5YQNrh2G1tQKaJAHn/ULEDVazJA?= =?us-ascii?Q?/kHSoD4pJF5E3eP4r9WLLhI165cTXLjL6ntF8A+wVgFa/k8uFVv7zrIct646?= =?us-ascii?Q?AkP4TwU997FCuleUDOLVVM/51cFGqxItOkMLKqJ7yGDdsiJ/0WAgRVpxxsnx?= =?us-ascii?Q?3iwUbtMUH8/Q42MDvrIeK+9JC9Jh3jx3HKZBN+OA/QI+L7l19QYuaJELo9NN?= =?us-ascii?Q?C4Ixl3kuS/0urFNjEjMrUXTywUiRsvnKKzLgElhShXge77yyKgsvPD2dXSj+?= =?us-ascii?Q?S+xHJNkzD5HkYipFmE+TYtFGFCPT5qfR88nVNRi5ATmXiJ9PsDvAOib9HkCg?= =?us-ascii?Q?QL1FenY69aybp32jO7GRk6ZKidANS5r6hvUCgNTvrg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f4ebbb3-5ea8-49fb-487a-08dc30b7e562 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2024 19:29:16.6629 (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: AS1P250MB0405 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/vvc/vvcdsp: Remove pointless wrappers 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: Andreas Rheinhardt 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: Signed-off-by: Andreas Rheinhardt --- libavcodec/vvc/vvcdsp.c | 18 ------------------ libavcodec/vvc/vvcdsp_template.c | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/libavcodec/vvc/vvcdsp.c b/libavcodec/vvc/vvcdsp.c index 214dc4e6c0..d63b9bc9b3 100644 --- a/libavcodec/vvc/vvcdsp.c +++ b/libavcodec/vvc/vvcdsp.c @@ -64,24 +64,6 @@ static int vvc_sad(const int16_t *src0, const int16_t *src1, int dx, int dy, return sad; } -#define itx_fn(type, s) \ -static void itx_##type##_##s(int *coeffs, ptrdiff_t step, size_t nz) \ -{ \ - ff_vvc_inv_##type##_##s(coeffs, step, nz); \ -} - -#define itx_fn_common(type) \ - itx_fn(type, 4); \ - itx_fn(type, 8); \ - itx_fn(type, 16); \ - itx_fn(type, 32); \ - -itx_fn_common(dct2); -itx_fn_common(dst7); -itx_fn_common(dct8); -itx_fn(dct2, 2); -itx_fn(dct2, 64); - typedef struct IntraEdgeParams { uint8_t* top; uint8_t* left; diff --git a/libavcodec/vvc/vvcdsp_template.c b/libavcodec/vvc/vvcdsp_template.c index f92c266478..33815d6765 100644 --- a/libavcodec/vvc/vvcdsp_template.c +++ b/libavcodec/vvc/vvcdsp_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] = itx_##type##_##s; \ + itx->itx[TYPE][TX_SIZE_##s] = ff_vvc_inv_##type##_##s; \ #define VVC_ITX_COMMON(TYPE, type) \ VVC_ITX(TYPE, type, 4); \ -- 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".