From patchwork Thu Apr 4 02:00:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47784 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp46933pzd; Wed, 3 Apr 2024 19:00:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWaobtq5X1I1g4Yy5ybXo9F4qhllc6yT5BnyFRWAbw9SzMuxg8iM3I36mJC6CGkN1dgBHMNR+NOL8SYLTtmco5BlzNbUJuO7sIY4w== X-Google-Smtp-Source: AGHT+IFi9bmcJ3BXQrSbxXD9RtjOx0bYmTxpJ5mutbiX2tMqxOGw8cCvRReAF3z8dc7FFb5r9Qp9 X-Received: by 2002:a50:9313:0:b0:568:180a:284b with SMTP id m19-20020a509313000000b00568180a284bmr474808eda.37.1712196043331; Wed, 03 Apr 2024 19:00:43 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c7-20020a50d647000000b0056c38035fbbsi7217452edj.15.2024.04.03.19.00.38; Wed, 03 Apr 2024 19:00:43 -0700 (PDT) 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=V51kWM22; 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AA6F268C4F1; Thu, 4 Apr 2024 05:00:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2092.outbound.protection.outlook.com [40.92.58.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 377AB68C4F1 for ; Thu, 4 Apr 2024 05:00:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rs3ebzOd6vJkGgrahsDlzI61LXe7e5SHY+YvS23Zie6p2DCsn8NubpMAEC7l12PG4XoQ2X0uK1LUxt1XJfKJPoepShf5h+pjOzV20QSMsG5tCN6UFNPHR+paaGrMAZVaAFsmKxBB0NfQJEcZPugU2yYhdjDVSO2rqBdkhOhL4yihVWkWGSEZBrYOa1zMoHjg8tRckjcTCZwlLwE1u6u2bpmPw+5hapWhpfTFPPj8O0lzNOe7E/eqD9TTSCleyFslWS80MGHzxCULzFiMdM9BSLONgg+/a56fSfZZNXEsQFz8ZO9Jx58or3jrQeIgcuCTbJ2vBpsDTClgV7ctISh7/g== 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=TpVk16d1m+bMjSVF/KAwfL2sXcIV+jT8cG/lVFn+990=; b=YPmf5ImPB9AzX3zr1qdbHVBsvFu+w7IEWDTQfZVl43FyKRBLfYCbggaR7kEa446/k4WUR+pkOzygQZvnX03BOfDX67T6csQmM6BhHbSLHOBw6mjym/Qb2ECg0R+/39ibSVh7RwaJAVnxCpz7d0h0EamE+D5oSsaB8f4HSOijQh5QgXgCxeoHKxRV8mOLsRlwVrBNXTH4m7ztjB2WQY8sNKQgfXwir4vhCe96x1c2A2333kl5L88yyFxjdepqu3EXzedkuhMSuL5f1Cs9ylQ1j9U7kqYrSmk1rkT1hJdLknaw3E5YWyVFiPLVMZl157y0Ptr6I+Uh59DORftksQ6G+Q== 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=TpVk16d1m+bMjSVF/KAwfL2sXcIV+jT8cG/lVFn+990=; b=V51kWM228wBOmBDrQeb/sHwpuMKQgMR/eSIzzLMXAJxixYs7MCXw9gk7eW1lu2scSIBMh6poHAeOCsmE7kppDhifozgTu+7CdHbbg0BGlmHfTZwmSPkrn2Str/X+i8ZSDV7hsko6vp0e595KKU2suYi/8rxJRCz1+uhb5Mn6h5Xx3uldVAzMdTrpe/SaM5k1mTLGMMWqc/bbFHnxa6ELkeQVw2X/VZjJetWUMgC4eUUHHGbuoKBW1CiQlOJRZAc2ta/pCZJIxjDdGY+PDe/QDxV3QfDuw+wYOMTqBejAvH1xnNIfLWDyMLO2Bmq/6xY4xh2C3lQgM7kKsAr5cgXCAA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0600.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:275::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 02:00:28 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Thu, 4 Apr 2024 02:00:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2024 04:00:20 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [+ij5mGM3BUij4hRjSNohLU4OHkj4Uft6] X-ClientProxiedBy: ZR2P278CA0008.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::11) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240404020020.3050261-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0600:EE_ X-MS-Office365-Filtering-Correlation-Id: a35d14c2-136c-4144-c4d6-08dc544afffd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +pleYRNnKpnJsL2sfpvOCp1SE8b2I2y8NST16Azb/MYRUKj/SWTMVJOL+59kafeSlLCAUCKpVIFpAi94lEhsGoDqH3OPhPxxzwhDRHrtqfTkiWE7IMcPv1RH0OW3Zpiiej3R+ku2sjENgbTr+eP9h8KuiFVBpH4f/hyrXDpYJ3NYqHdYGskHAognxY8VSSAkLLF8xCa9CdIyWcCgLqvoqfrNtHI2/l7Cll2iuV5FGSqgCa9vM+gNs6LIE8e0IuFV7pEZg5QCDXKUOoI8ouLB/zPCQFhQZ4f3Ngd4IIuSxImPNIzVt9QA5lmfq8ikFkfmXhTXuaLHct1xe8LTU5NR2Bgftm+pOodPijsgvJQhOV8f07vZYwl1OvEWS6VAl6F15lr55SzeWW70wDnOMTeWjgLhoJiF2JTO7ZwNJRmqQCvwzHbEb66F4mDBSs4OFSoiBKETfiYh4VMMObuATuSqQ2RhyjuRZce2SUlNCdHmLoMjsSZ53QZc80Kz+lrsFU23EdmZpZcRKlmwz/LdTSnSyFMAbk7NZSNlxOqERoevJglwwjqVyEzr/P+jplObC6CUDxn18fZzBg0fr/2Jwb8GtvzYX4Ez0tymD4VuXaXpjnGradPa/pioK1S3g+PY3Wlf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oYoXa5BNuwBHoYnlW1mVUmRB15lkC7C/TV3QPlLoSz2mwva0ttPhSO/kuxaumfEfwJSAYXBVN2YLwT8rNlEw6LMQNuaL1LTPToqYIoBH7WEi0drGJmpjIREOdzhWH0/1PZ6Mvv2JCtHiGqzpOZ6X7RBLdsIlbvBjWRyDbkLMqDqANRD4BC7qmKlKMO50K6VZ8OgDQrCkBxXq4JwEAXk2eK0ucFa6QSPfFCAULcrINUoKAGBrScj58bj75Sc+K4fQwrcD/iyiKbeaV0/JyqfqDl1jvfUmojScD3YmPmjzYExTBannB9HaALZ/1u9Vd3B9cIfwXLDFfMllJyzk+stzJFBUAyW1XlNI589ZFmhJRKeYSk4DAqxvuPedXVQVrzJW4sVtFch5j2IRpGBCiM2AsV0OS5Qlq41jUgx46Lj3MELXemG3GqOiatAcO6hJde0zyxPagYU7JEUZeQYuBI07SmZ10Z5iPdIyixF06/uje5dxakXQfP8fyd0zHDQzr9IH2B4Edz/gDyOACbem/vA64obXSmngSBkbQAr4ux9XE2hZYHjU/Yju/FECjTkiAp1KHskz1ojk7KiMpheJUw3TvoGWqauJYfkeYc/UWloXjQlPuTSVm5CC2zLibE/qrgpSJiTGo+UWjTv6LQJglZEhAP4WtLRh50yrhUvDLfbA8AgVq1BSrormc52t+T/DCtv5lfVSBXpEJ/jrPvfQBMFAHTS8R9/GmkDl0vJYSZQkCvmabhg8LJBCWvYi8ZUG0YhHGwq6QF/2M2PdzmhUSB5Oud96LZXz+qLpneEkHSBHJ7paRKQ9q7ylkyAb9xkoQm49WWWF9dHxkaJPiG5nNpBIG7gZZc7jI2ifb7EJ9QSX+dpvNPGK1pgmPA1zrUFCboZG+15eWJmEPJhj0Lyq9Thjf59Q+aAcWZOYOdoU/FD9EZdKKMB5Vm0N8MRviw+bcKtH0U1GnjHQfJwu+v5Uvwqo/3rd7a8Jsuif9EsZE8BF9OBPsUw0A69LVIpEeX8YhtKCyXf7RzmYApp9XXMEhPoItIs4CoG+1fTceVJamsL03WC2JQSvtzo5Bgw2VHyzeqKZ5VfKCFexrpPVhkGwShEd38DpGYVQbKbE5KlTimkmnqJkYK5huNsgtDT5QHFr3pkBpDP6qx4DbaAylOu0FUnormiDH+oLX6xYNLJ/dr3Msl0sdr8M1fkmy0vK0I2CN93GVcPEJgdpgp/nKQxzwdizqVgOUlsnLpvyDvTNyybqkneey5laKHjuKcJa1GfVanG7YXNSv+grKvAcHShA4QADTQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a35d14c2-136c-4144-c4d6-08dc544afffd X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 02:00:28.1124 (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: PAXP250MB0600 Subject: [FFmpeg-devel] [PATCH] avcodec/vvc/vvc_inter_template: Fix left shift of negative number 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GcAaIxvuy69M Affected the vvc-conformance-WP_A_3 FATE test. Signed-off-by: Andreas Rheinhardt --- libavcodec/vvc/vvc_inter_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vvc/vvc_inter_template.c b/libavcodec/vvc/vvc_inter_template.c index e5cff079fb..e2fbfd4fc0 100644 --- a/libavcodec/vvc/vvc_inter_template.c +++ b/libavcodec/vvc/vvc_inter_template.c @@ -46,7 +46,7 @@ static void FUNC(w_avg)(uint8_t *_dst, const ptrdiff_t _dst_stride, pixel *dst = (pixel*)_dst; const ptrdiff_t dst_stride = _dst_stride / sizeof(pixel); const int shift = denom + FFMAX(3, 15 - BIT_DEPTH); - const int offset = (((o0 + o1) << (BIT_DEPTH - 8)) + 1) << (shift - 1); + const int offset = ((o0 + o1) * (1 << (BIT_DEPTH - 8)) + 1) * (1 << (shift - 1)); for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) From patchwork Thu Apr 4 02:17:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47785 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp52397pzd; Wed, 3 Apr 2024 19:17:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWb71MMZWy9gbFSWZ93Q4dPMEN9uiN9BOGPeYg/KnxNFuQjsgOBLKvkHmq7Y0UHDZvnN32/b4woupabDX0qV3JyWZPZYPH2GhWj0A== X-Google-Smtp-Source: AGHT+IGTkcLLmD0pyF4pq//R2/qZEFT1WLF+Py8oc8Dh8bw1pWo9v7OMNidmG/Zu6Dbx7xymJGtv X-Received: by 2002:a05:6000:118d:b0:343:c35d:1401 with SMTP id g13-20020a056000118d00b00343c35d1401mr29965wrx.2.1712197070894; Wed, 03 Apr 2024 19:17:50 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u11-20020a170906124b00b00a4751179cd2si7106880eja.528.2024.04.03.19.17.30; Wed, 03 Apr 2024 19:17:50 -0700 (PDT) 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=B47vctz2; 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D2D868D12D; Thu, 4 Apr 2024 05:17:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2065.outbound.protection.outlook.com [40.92.91.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09FBF68D07E for ; Thu, 4 Apr 2024 05:17:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JvWgsf2wUu9K3S5NMWZ8Qifpl2y4FesIt7CF5YB8Y+K1JcfaWouBq+Sd6yo8Ez/VY5DDDpaJTahfDNxbBd3mi3XLX3GKcEJOVLtWSbiUY9xV4wQTqJbYkom4HC07Fjr5kxVS3rv1S3hQdxw3ygUaUpZAd7VUg6ylj9xCrvQ0EblDIbfFNnPfcYTOcshhWSOoyD6rGsgtgErYPeyZgEkniT5eAAjn/+z+Vx+g1e0D2mdooSt1b+gPuWiWn/uNBZERupEx5ZTPqJBqEnxqoBQ9Z+NP5blci5VCu8u1AEKKjWBzKO4MJz6XxyvNem+2JICs4bVfMoinOFSFSu/CsYpldw== 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=tF87Rq+rJhabuT6utlR0SSl3igbFkLSbq+WSTdf/KgQ=; b=lgTQKoqkfiW+IQcDCML4FTfuPDaWSEKuEpjOXZs/CxnHtuyrBX0xR91xIunRqRCnzZC7t0DcHaB2KSQyCBPIUhrCxwfZRZxdaGv5W9iGoyAo32qXkonCKhr/Ro/SNzOhhFD+SLpYqDPt0/wVzxHbTDfME2K3oEOiMT31VVhBImua8+MmcaL3IoJKoxq4cxWhYQoWuvtkE20sbH0EBTz7/s7XuXnpdfrmTQHBVxESd4PPYu5aZ0/44GNLpyNmhRenT9x1dDWVdMmnr0HJAzCNvrPAss9YYkgIAPHEIM54rHJtrUyghjLKbuJvZ8gZUMEpJ5xfZ/WHZxe5pgze4ft+og== 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=tF87Rq+rJhabuT6utlR0SSl3igbFkLSbq+WSTdf/KgQ=; b=B47vctz27blH9fXedSs4DIJn+lpcJnxtMIw4k4VyV2RpgMmiiyZt8g/4cZjYuumGobojF+1aFdHbih9/tXIkkdtvigccuBQ/U4f5QZLBNVt0hKxncqcPeonrw6vswZzLQ3XmnYmvXf56+pUtb4ass6tiDi6hNu2+aOSNDMvrpgzxGiowU66AvXRFHHzuF0sQqoClaimGnSruohWWAb+07ZspXlRhRr57HyHNAix3l1MiAkoTFNM+eysvMf0qdWAfqoM/FbArcZxsSCyN1mDhGAzMxjHCdLuKYRmlcqz49gI6MK+j3+3WFcgwf40iPf1iRpWWbT7HHjQoNd5GdwAK9w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0165.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:374::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 02:17:18 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Thu, 4 Apr 2024 02:17:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2024 04:17:10 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [DUJTU9eTRNVjJ+O1aodkSTtIrmPdnTRpbXCNDM/9vdE=] X-ClientProxiedBy: ZR0P278CA0030.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240404021710.3051631-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0165:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d1ec2af-050b-4d4e-188d-08dc544d5a1d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cAQ6QMCJYNY1VcJ+CJryVHTwpM+4YLSN3pXWfDc3n8bTvNF1fvHnPnZM5me+4rD81HOM5j+HZQKVK+kZYnYLJ5o/bAx37IVykwqEUcO7F5RL/tJ+pohbWZnRlP8G+9UcBoRRhnYQCHu1AMOg0SK+lgF4sEcnernA+uisqJSYj/bPct/QajLnyuzuzy0maclDYuCmtm9K9hD3Ps5hrEjPY8B9zmt9mQC278MlgccGKHu43+yD2TbGTDVFnIxaBk4A4JE6D6he/lDuYZrjBmQchpjjcZ3L6CwILKyplzoiDFXraQ+5A9xE7ZmtneHvd9asAr9OWzWznJSj5P2fqlsbDaosw3NN8VGrEpY4+quJnYmAFDd6DBC0ZODXbsdZrywCihsG/cufHiO9Y4821duxQ9xQyL/2sXFVC4Ydvs1PSY/LLlL1DpJQ2DAPoZiKrEzYYHk/pVzRcULs39dBSMJLFlBsQl58Wl+9cH9YdMRl2JnVQJdxbeUgOijJKT/i7MSBt+UpHNm7rVzUbMTe5/H6+ZKrrMA1Scck9dvNs/PrImDR+7hJpLfR64D+YL6Lprj3A+3n2N2yw4q+5LJcGOyaxYHgNd/M334i3TAmBOLCaCL+rYXFEznxFscy1r6ruGd4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KKAzlb5ejEq1yDLlKtV7JX4mWVhlJy18iOV9FXclbOw/+2Jam/KePAlAXyMovIQBaIfCH0VHYNmpfCmqbnhxby2W1t58mITg+Y/7mcsiuqmYHDkbvuKsiO4GloqfpnWCrwDvStYoHSFG73BQCndIPVYq5GYEQ353CdyYdtllH349QMDBH3UVbINXKlUIDyPCBSZMsLMpp76XMZRzDCUmfTFM2uEqqS19rRwAaF05cd5UENBfBAQP00v8NrCpnWjMlbp1+OA84Hgj62VcLcoFnWOnPh8LQjd2BL+JeYAcl6xSuiLXv6xIqn0L+lg3GLiCVJ5M56XbxRNJIXqFv4CZqpU9GLz6YGy33uGyAtW9+6zZiBmUInh+6rivAFrtpJ6Z4R269+6m/clmXZnchyTyAlnIpQX6Ym4vE4xMf4Xs6RftxiWV7QuIUnV2ZLEUwG32bgWEGGQvMLvWxq5HxHSXCSdUwV9y8e2YinlgkZ5ctxB49TMDd5VmQYbCs7avTmelSd+i/08911r/pQTBpW4sqWJV0LOAZLY050m7rQlm/h/Tu5MEvmXGCbfEPmK0atRfBZ/MGXQm45H4Zv8l2SMUOwU8M69r69MaWMS3Vuj5oLGOhdhXAL5IEQ2lPesbpAKXpzX8xuiOW9SigSlzLc8HD1boEmi3nH+/aUy+CQMKPIpXtcSVlGG3BHA6t2B1MHO2Ylenw9ZZmOBo4CUC96XfMLSyGvg736grz6oZl4DU8q4Jjh5wkbXtZmoyeUHUXAAPhrVEdmuPDoM1Qu2dihrhPsad4SGHVTWJRA0c/eIn3PF+7DjfxfMd/NmGfwEB6dGHredwF6zP+9zcQZH9Yis91mlfYgb3dYrm/AX1qCCitWTZCqABzcmIos90jSNlIKBqLnR8zFZ7NG3NtRMDuXTf4iDPx78E/pjCw4ElTEh4+dgJl/m5ZxxgZz2jCBg9NhbCX39s09xRarbTZpMltZnGRdblHXXn8IxdA0lpRHiaSW7YaZoWVkLOuBA9vdF7Bp/xWnCrBx50uCxhfBUSk9/Siw03LTslPk0qmDdtpMf+UqHh0I88YvpPwSICi6Q9fiWNYBB7Ise0Dwe1YdSpds8Yo9IbovkI+EDWnznuV/XXcqH35QQsNjSgWsPeDp+xFGFHWZGU65QCfds13i8/a4huiV4kuQxAZtrXHeNGx1uByaC2YstVT5kUXCNDKMNcDcbJmDlM8LA5xiCjF7HsovR2TPtlBk3nzpcaYfeDHGODFxPIpZLs3WOtgtF4gZ7BFKX3R8gR5nw2i40SDZBl4hA87w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d1ec2af-050b-4d4e-188d-08dc544d5a1d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 02:17:18.3566 (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: AS8P250MB0165 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/vvc: Rename vvc_?foo->foo 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tPx39eCm8xq9 A namespace is unnecessary here given that all these files are already in the vvc subfolder. Signed-off-by: Andreas Rheinhardt --- libavcodec/vvc/Makefile | 28 +++++++++---------- libavcodec/vvc/{vvc_cabac.c => cabac.c} | 6 ++-- libavcodec/vvc/{vvc_cabac.h => cabac.h} | 2 +- libavcodec/vvc/{vvc_ctu.c => ctu.c} | 8 +++--- libavcodec/vvc/{vvc_ctu.h => ctu.h} | 2 +- libavcodec/vvc/{vvc_data.c => data.c} | 2 +- libavcodec/vvc/{vvc_data.h => data.h} | 0 libavcodec/vvc/{vvcdec.c => dec.c} | 10 +++---- libavcodec/vvc/{vvcdec.h => dec.h} | 4 +-- libavcodec/vvc/{vvcdsp.c => dsp.c} | 12 ++++---- libavcodec/vvc/{vvcdsp.h => dsp.h} | 0 .../vvc/{vvcdsp_template.c => dsp_template.c} | 10 +++---- libavcodec/vvc/{vvc_filter.c => filter.c} | 8 +++--- libavcodec/vvc/{vvc_filter.h => filter.h} | 2 +- ...vc_filter_template.c => filter_template.c} | 0 libavcodec/vvc/{vvc_inter.c => inter.c} | 8 +++--- libavcodec/vvc/{vvc_inter.h => inter.h} | 2 +- ...{vvc_inter_template.c => inter_template.c} | 0 libavcodec/vvc/{vvc_intra.c => intra.c} | 8 +++--- libavcodec/vvc/{vvc_intra.h => intra.h} | 2 +- ...{vvc_intra_template.c => intra_template.c} | 2 +- .../vvc/{vvc_intra_utils.c => intra_utils.c} | 8 +++--- libavcodec/vvc/{vvc_itx_1d.c => itx_1d.c} | 4 +-- libavcodec/vvc/{vvc_itx_1d.h => itx_1d.h} | 0 libavcodec/vvc/{vvc_mvs.c => mvs.c} | 8 +++--- libavcodec/vvc/{vvc_mvs.h => mvs.h} | 2 +- libavcodec/vvc/{vvc_ps.c => ps.c} | 6 ++-- libavcodec/vvc/{vvc_ps.h => ps.h} | 0 libavcodec/vvc/{vvc_refs.c => refs.c} | 2 +- libavcodec/vvc/{vvc_refs.h => refs.h} | 2 +- libavcodec/vvc/{vvc_thread.c => thread.c} | 12 ++++---- libavcodec/vvc/{vvc_thread.h => thread.h} | 2 +- libavcodec/x86/vvc/vvcdsp_init.c | 7 ++--- tests/checkasm/vvc_mc.c | 6 ++-- 34 files changed, 87 insertions(+), 88 deletions(-) rename libavcodec/vvc/{vvc_cabac.c => cabac.c} (99%) rename libavcodec/vvc/{vvc_cabac.h => cabac.h} (99%) rename libavcodec/vvc/{vvc_ctu.c => ctu.c} (99%) rename libavcodec/vvc/{vvc_ctu.h => ctu.h} (99%) rename libavcodec/vvc/{vvc_data.c => data.c} (99%) rename libavcodec/vvc/{vvc_data.h => data.h} (100%) rename libavcodec/vvc/{vvcdec.c => dec.c} (99%) rename libavcodec/vvc/{vvcdec.h => dec.h} (99%) rename libavcodec/vvc/{vvcdsp.c => dsp.c} (96%) rename libavcodec/vvc/{vvcdsp.h => dsp.h} (100%) rename libavcodec/vvc/{vvcdsp_template.c => dsp_template.c} (96%) rename libavcodec/vvc/{vvc_filter.c => filter.c} (99%) rename libavcodec/vvc/{vvc_filter.h => filter.h} (99%) rename libavcodec/vvc/{vvc_filter_template.c => filter_template.c} (100%) rename libavcodec/vvc/{vvc_inter.c => inter.c} (99%) rename libavcodec/vvc/{vvc_inter.h => inter.h} (98%) rename libavcodec/vvc/{vvc_inter_template.c => inter_template.c} (100%) rename libavcodec/vvc/{vvc_intra.c => intra.c} (99%) rename libavcodec/vvc/{vvc_intra.h => intra.h} (98%) rename libavcodec/vvc/{vvc_intra_template.c => intra_template.c} (99%) rename libavcodec/vvc/{vvc_intra_utils.c => intra_utils.c} (98%) rename libavcodec/vvc/{vvc_itx_1d.c => itx_1d.c} (99%) rename libavcodec/vvc/{vvc_itx_1d.h => itx_1d.h} (100%) rename libavcodec/vvc/{vvc_mvs.c => mvs.c} (99%) rename libavcodec/vvc/{vvc_mvs.h => mvs.h} (99%) rename libavcodec/vvc/{vvc_ps.c => ps.c} (99%) rename libavcodec/vvc/{vvc_ps.h => ps.h} (100%) rename libavcodec/vvc/{vvc_refs.c => refs.c} (99%) rename libavcodec/vvc/{vvc_refs.h => refs.h} (99%) rename libavcodec/vvc/{vvc_thread.c => thread.c} (99%) rename libavcodec/vvc/{vvc_thread.h => thread.h} (98%) diff --git a/libavcodec/vvc/Makefile b/libavcodec/vvc/Makefile index 2a0055d494..6a28d32bc2 100644 --- a/libavcodec/vvc/Makefile +++ b/libavcodec/vvc/Makefile @@ -1,17 +1,17 @@ clean:: $(RM) $(CLEANSUFFIXES:%=libavcodec/vvc/%) -OBJS-$(CONFIG_VVC_DECODER) += vvc/vvcdec.o \ - vvc/vvcdsp.o \ - vvc/vvc_cabac.o \ - vvc/vvc_ctu.o \ - vvc/vvc_data.o \ - vvc/vvc_filter.o \ - vvc/vvc_inter.o \ - vvc/vvc_intra.o \ - vvc/vvc_intra_utils.o \ - vvc/vvc_itx_1d.o \ - vvc/vvc_mvs.o \ - vvc/vvc_ps.o \ - vvc/vvc_refs.o \ - vvc/vvc_thread.o \ +OBJS-$(CONFIG_VVC_DECODER) += vvc/dec.o \ + vvc/dsp.o \ + vvc/cabac.o \ + vvc/ctu.o \ + vvc/data.o \ + vvc/filter.o \ + vvc/inter.o \ + vvc/intra.o \ + vvc/intra_utils.o \ + vvc/itx_1d.o \ + vvc/mvs.o \ + vvc/ps.o \ + vvc/refs.o \ + vvc/thread.o \ diff --git a/libavcodec/vvc/vvc_cabac.c b/libavcodec/vvc/cabac.c similarity index 99% rename from libavcodec/vvc/vvc_cabac.c rename to libavcodec/vvc/cabac.c index 5e24a1b677..a5ccccd1c0 100644 --- a/libavcodec/vvc/vvc_cabac.c +++ b/libavcodec/vvc/cabac.c @@ -21,9 +21,9 @@ */ #include "libavcodec/cabac_functions.h" -#include "vvc_cabac.h" -#include "vvc_ctu.h" -#include "vvc_data.h" +#include "cabac.h" +#include "ctu.h" +#include "data.h" #define CABAC_MAX_BIN 31 diff --git a/libavcodec/vvc/vvc_cabac.h b/libavcodec/vvc/cabac.h similarity index 99% rename from libavcodec/vvc/vvc_cabac.h rename to libavcodec/vvc/cabac.h index 172ab272ff..f935b79737 100644 --- a/libavcodec/vvc/vvc_cabac.h +++ b/libavcodec/vvc/cabac.h @@ -23,7 +23,7 @@ #ifndef AVCODEC_VVC_VVC_CABAC_H #define AVCODEC_VVC_VVC_CABAC_H -#include "vvc_ctu.h" +#include "ctu.h" int ff_vvc_cabac_init(VVCLocalContext *lc, int ctu_idx, int rx, int ry); diff --git a/libavcodec/vvc/vvc_ctu.c b/libavcodec/vvc/ctu.c similarity index 99% rename from libavcodec/vvc/vvc_ctu.c rename to libavcodec/vvc/ctu.c index 8ba12c8d9f..53f92ca10f 100644 --- a/libavcodec/vvc/vvc_ctu.c +++ b/libavcodec/vvc/ctu.c @@ -22,10 +22,10 @@ #include "libavcodec/refstruct.h" -#include "vvc_cabac.h" -#include "vvc_ctu.h" -#include "vvc_inter.h" -#include "vvc_mvs.h" +#include "cabac.h" +#include "ctu.h" +#include "inter.h" +#include "mvs.h" #define PROF_TEMP_SIZE (PROF_BLOCK_SIZE) * sizeof(int16_t) diff --git a/libavcodec/vvc/vvc_ctu.h b/libavcodec/vvc/ctu.h similarity index 99% rename from libavcodec/vvc/vvc_ctu.h rename to libavcodec/vvc/ctu.h index 460dbdba59..358e9358d7 100644 --- a/libavcodec/vvc/vvc_ctu.h +++ b/libavcodec/vvc/ctu.h @@ -26,7 +26,7 @@ #include "libavcodec/cabac.h" #include "libavutil/mem_internal.h" -#include "vvcdec.h" +#include "dec.h" #define MAX_CTU_SIZE 128 diff --git a/libavcodec/vvc/vvc_data.c b/libavcodec/vvc/data.c similarity index 99% rename from libavcodec/vvc/vvc_data.c rename to libavcodec/vvc/data.c index 0c9376d098..ace585b663 100644 --- a/libavcodec/vvc/vvc_data.c +++ b/libavcodec/vvc/data.c @@ -22,7 +22,7 @@ #include "libavutil/avassert.h" -#include "vvc_data.h" +#include "data.h" const uint8_t ff_vvc_diag_scan_x[5][5][16*16] = { { diff --git a/libavcodec/vvc/vvc_data.h b/libavcodec/vvc/data.h similarity index 100% rename from libavcodec/vvc/vvc_data.h rename to libavcodec/vvc/data.h diff --git a/libavcodec/vvc/vvcdec.c b/libavcodec/vvc/dec.c similarity index 99% rename from libavcodec/vvc/vvcdec.c rename to libavcodec/vvc/dec.c index d7a89f7488..eb447604fe 100644 --- a/libavcodec/vvc/vvcdec.c +++ b/libavcodec/vvc/dec.c @@ -28,11 +28,11 @@ #include "libavutil/mem.h" #include "libavutil/thread.h" -#include "vvcdec.h" -#include "vvc_ctu.h" -#include "vvc_data.h" -#include "vvc_refs.h" -#include "vvc_thread.h" +#include "dec.h" +#include "ctu.h" +#include "data.h" +#include "refs.h" +#include "thread.h" #define TAB_MAX 32 diff --git a/libavcodec/vvc/vvcdec.h b/libavcodec/vvc/dec.h similarity index 99% rename from libavcodec/vvc/vvcdec.h rename to libavcodec/vvc/dec.h index aa3d715524..646bd556f8 100644 --- a/libavcodec/vvc/vvcdec.h +++ b/libavcodec/vvc/dec.h @@ -27,8 +27,8 @@ #include "libavcodec/videodsp.h" #include "libavcodec/vvc.h" -#include "vvc_ps.h" -#include "vvcdsp.h" +#include "ps.h" +#include "dsp.h" #define LUMA 0 #define CHROMA 1 diff --git a/libavcodec/vvc/vvcdsp.c b/libavcodec/vvc/dsp.c similarity index 96% rename from libavcodec/vvc/vvcdsp.c rename to libavcodec/vvc/dsp.c index d63b9bc9b3..41e830a98a 100644 --- a/libavcodec/vvc/vvcdsp.c +++ b/libavcodec/vvc/dsp.c @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "vvcdsp.h" -#include "vvc_ctu.h" -#include "vvc_itx_1d.h" +#include "dsp.h" +#include "ctu.h" +#include "itx_1d.h" #define VVC_SIGN(v) (v < 0 ? -1 : !!v) @@ -84,15 +84,15 @@ typedef struct IntraEdgeParams { #define BDOF_GRADIENT_SIZE (BDOF_BLOCK_SIZE + BDOF_BORDER_EXT * 2) #define BIT_DEPTH 8 -#include "vvcdsp_template.c" +#include "dsp_template.c" #undef BIT_DEPTH #define BIT_DEPTH 10 -#include "vvcdsp_template.c" +#include "dsp_template.c" #undef BIT_DEPTH #define BIT_DEPTH 12 -#include "vvcdsp_template.c" +#include "dsp_template.c" #undef BIT_DEPTH void ff_vvc_dsp_init(VVCDSPContext *vvcdsp, int bit_depth) diff --git a/libavcodec/vvc/vvcdsp.h b/libavcodec/vvc/dsp.h similarity index 100% rename from libavcodec/vvc/vvcdsp.h rename to libavcodec/vvc/dsp.h diff --git a/libavcodec/vvc/vvcdsp_template.c b/libavcodec/vvc/dsp_template.c similarity index 96% rename from libavcodec/vvc/vvcdsp_template.c rename to libavcodec/vvc/dsp_template.c index 33815d6765..8130abbccf 100644 --- a/libavcodec/vvc/vvcdsp_template.c +++ b/libavcodec/vvc/dsp_template.c @@ -22,12 +22,12 @@ #include "libavutil/frame.h" #include "libavcodec/bit_depth_template.c" -#include "vvcdec.h" -#include "vvc_data.h" +#include "dec.h" +#include "data.h" -#include "vvc_inter_template.c" -#include "vvc_intra_template.c" -#include "vvc_filter_template.c" +#include "inter_template.c" +#include "intra_template.c" +#include "filter_template.c" static void FUNC(add_residual)(uint8_t *_dst, const int *res, const int w, const int h, const ptrdiff_t _stride) diff --git a/libavcodec/vvc/vvc_filter.c b/libavcodec/vvc/filter.c similarity index 99% rename from libavcodec/vvc/vvc_filter.c rename to libavcodec/vvc/filter.c index de0816619b..8f44255ce4 100644 --- a/libavcodec/vvc/vvc_filter.c +++ b/libavcodec/vvc/filter.c @@ -21,10 +21,10 @@ */ #include "libavutil/frame.h" -#include "vvc_ctu.h" -#include "vvc_data.h" -#include "vvc_filter.h" -#include "vvc_refs.h" +#include "ctu.h" +#include "data.h" +#include "filter.h" +#include "refs.h" #define LEFT 0 #define TOP 1 diff --git a/libavcodec/vvc/vvc_filter.h b/libavcodec/vvc/filter.h similarity index 99% rename from libavcodec/vvc/vvc_filter.h rename to libavcodec/vvc/filter.h index 9597437d83..2f91803e56 100644 --- a/libavcodec/vvc/vvc_filter.h +++ b/libavcodec/vvc/filter.h @@ -23,7 +23,7 @@ #ifndef AVCODEC_VVC_VVC_FILTER_H #define AVCODEC_VVC_VVC_FILTER_H -#include "vvcdec.h" +#include "dec.h" /** * lmcs filter for the CTU diff --git a/libavcodec/vvc/vvc_filter_template.c b/libavcodec/vvc/filter_template.c similarity index 100% rename from libavcodec/vvc/vvc_filter_template.c rename to libavcodec/vvc/filter_template.c diff --git a/libavcodec/vvc/vvc_inter.c b/libavcodec/vvc/inter.c similarity index 99% rename from libavcodec/vvc/vvc_inter.c rename to libavcodec/vvc/inter.c index 1a87cb71cf..4a8d1d866a 100644 --- a/libavcodec/vvc/vvc_inter.c +++ b/libavcodec/vvc/inter.c @@ -21,10 +21,10 @@ */ #include "libavutil/frame.h" -#include "vvc_data.h" -#include "vvc_inter.h" -#include "vvc_mvs.h" -#include "vvc_refs.h" +#include "data.h" +#include "inter.h" +#include "mvs.h" +#include "refs.h" // +1 is enough, + 32 for asm alignment #define PROF_TEMP_OFFSET (MAX_PB_SIZE + 32) diff --git a/libavcodec/vvc/vvc_inter.h b/libavcodec/vvc/inter.h similarity index 98% rename from libavcodec/vvc/vvc_inter.h rename to libavcodec/vvc/inter.h index 61fc44b3a0..1ccf6bb295 100644 --- a/libavcodec/vvc/vvc_inter.h +++ b/libavcodec/vvc/inter.h @@ -23,7 +23,7 @@ #ifndef AVCODEC_VVC_VVC_INTER_H #define AVCODEC_VVC_VVC_INTER_H -#include "vvc_ctu.h" +#include "ctu.h" /** * Loop entire CTU to predict all inter coding blocks diff --git a/libavcodec/vvc/vvc_inter_template.c b/libavcodec/vvc/inter_template.c similarity index 100% rename from libavcodec/vvc/vvc_inter_template.c rename to libavcodec/vvc/inter_template.c diff --git a/libavcodec/vvc/vvc_intra.c b/libavcodec/vvc/intra.c similarity index 99% rename from libavcodec/vvc/vvc_intra.c rename to libavcodec/vvc/intra.c index 6d976320f8..e515fb9710 100644 --- a/libavcodec/vvc/vvc_intra.c +++ b/libavcodec/vvc/intra.c @@ -22,10 +22,10 @@ #include "libavutil/frame.h" #include "libavutil/imgutils.h" -#include "vvc_data.h" -#include "vvc_inter.h" -#include "vvc_intra.h" -#include "vvc_itx_1d.h" +#include "data.h" +#include "inter.h" +#include "intra.h" +#include "itx_1d.h" static int is_cclm(enum IntraPredMode mode) { diff --git a/libavcodec/vvc/vvc_intra.h b/libavcodec/vvc/intra.h similarity index 98% rename from libavcodec/vvc/vvc_intra.h rename to libavcodec/vvc/intra.h index 6b674008f9..e09467a617 100644 --- a/libavcodec/vvc/vvc_intra.h +++ b/libavcodec/vvc/intra.h @@ -22,7 +22,7 @@ #ifndef AVCODEC_VVC_VVC_INTRA_H #define AVCODEC_VVC_VVC_INTRA_H -#include "vvc_ctu.h" +#include "ctu.h" /** * reconstruct a CTU diff --git a/libavcodec/vvc/vvc_intra_template.c b/libavcodec/vvc/intra_template.c similarity index 99% rename from libavcodec/vvc/vvc_intra_template.c rename to libavcodec/vvc/intra_template.c index a078885266..1a4d5f6f93 100644 --- a/libavcodec/vvc/vvc_intra_template.c +++ b/libavcodec/vvc/intra_template.c @@ -22,7 +22,7 @@ #include "libavcodec/bit_depth_template.c" -#include "vvc_intra.h" +#include "intra.h" #define POS(x, y) src[(x) + stride * (y)] diff --git a/libavcodec/vvc/vvc_intra_utils.c b/libavcodec/vvc/intra_utils.c similarity index 98% rename from libavcodec/vvc/vvc_intra_utils.c rename to libavcodec/vvc/intra_utils.c index 7d34cff023..040aacdffe 100644 --- a/libavcodec/vvc/vvc_intra_utils.c +++ b/libavcodec/vvc/intra_utils.c @@ -25,10 +25,10 @@ #include "libavutil/avassert.h" #include "libavutil/macros.h" #include "libavutil/common.h" -#include "vvc_ctu.h" -#include "vvc_intra.h" -#include "vvc_ps.h" -#include "vvcdec.h" +#include "ctu.h" +#include "intra.h" +#include "ps.h" +#include "dec.h" int ff_vvc_get_mip_size_id(const int w, const int h) { diff --git a/libavcodec/vvc/vvc_itx_1d.c b/libavcodec/vvc/itx_1d.c similarity index 99% rename from libavcodec/vvc/vvc_itx_1d.c rename to libavcodec/vvc/itx_1d.c index cb076f680f..c84e39440a 100644 --- a/libavcodec/vvc/vvc_itx_1d.c +++ b/libavcodec/vvc/itx_1d.c @@ -57,8 +57,8 @@ Compact inverse discrete cosine transform circuit for MPEG video decoding. */ -#include "vvc_data.h" -#include "vvc_itx_1d.h" +#include "data.h" +#include "itx_1d.h" #include "libavutil/avutil.h" #define G2(m) ((nz > 2) ? (m) : 0) diff --git a/libavcodec/vvc/vvc_itx_1d.h b/libavcodec/vvc/itx_1d.h similarity index 100% rename from libavcodec/vvc/vvc_itx_1d.h rename to libavcodec/vvc/itx_1d.h diff --git a/libavcodec/vvc/vvc_mvs.c b/libavcodec/vvc/mvs.c similarity index 99% rename from libavcodec/vvc/vvc_mvs.c rename to libavcodec/vvc/mvs.c index 37a2d0a228..fe7d923460 100644 --- a/libavcodec/vvc/vvc_mvs.c +++ b/libavcodec/vvc/mvs.c @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "vvc_ctu.h" -#include "vvc_data.h" -#include "vvc_refs.h" -#include "vvc_mvs.h" +#include "ctu.h" +#include "data.h" +#include "refs.h" +#include "mvs.h" #define IS_SAME_MV(a, b) (AV_RN64A(a) == AV_RN64A(b)) diff --git a/libavcodec/vvc/vvc_mvs.h b/libavcodec/vvc/mvs.h similarity index 99% rename from libavcodec/vvc/vvc_mvs.h rename to libavcodec/vvc/mvs.h index 78ad17c303..71631dad1b 100644 --- a/libavcodec/vvc/vvc_mvs.h +++ b/libavcodec/vvc/mvs.h @@ -23,7 +23,7 @@ #ifndef AVCODEC_VVC_VVC_MVS_H #define AVCODEC_VVC_VVC_MVS_H -#include "vvc_ctu.h" +#include "ctu.h" void ff_vvc_round_mv(Mv *mv, int lshift, int rshift); void ff_vvc_clip_mv(Mv *mv); diff --git a/libavcodec/vvc/vvc_ps.c b/libavcodec/vvc/ps.c similarity index 99% rename from libavcodec/vvc/vvc_ps.c rename to libavcodec/vvc/ps.c index 301fa16400..0365feab47 100644 --- a/libavcodec/vvc/vvc_ps.c +++ b/libavcodec/vvc/ps.c @@ -25,9 +25,9 @@ #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavcodec/refstruct.h" -#include "vvc_data.h" -#include "vvc_ps.h" -#include "vvcdec.h" +#include "data.h" +#include "ps.h" +#include "dec.h" static int sps_map_pixel_format(VVCSPS *sps, void *log_ctx) { diff --git a/libavcodec/vvc/vvc_ps.h b/libavcodec/vvc/ps.h similarity index 100% rename from libavcodec/vvc/vvc_ps.h rename to libavcodec/vvc/ps.h diff --git a/libavcodec/vvc/vvc_refs.c b/libavcodec/vvc/refs.c similarity index 99% rename from libavcodec/vvc/vvc_refs.c rename to libavcodec/vvc/refs.c index 553b25e1ce..a5ee7338d6 100644 --- a/libavcodec/vvc/vvc_refs.c +++ b/libavcodec/vvc/refs.c @@ -27,7 +27,7 @@ #include "libavcodec/refstruct.h" #include "libavcodec/thread.h" -#include "vvc_refs.h" +#include "refs.h" #define VVC_FRAME_FLAG_OUTPUT (1 << 0) #define VVC_FRAME_FLAG_SHORT_REF (1 << 1) diff --git a/libavcodec/vvc/vvc_refs.h b/libavcodec/vvc/refs.h similarity index 99% rename from libavcodec/vvc/vvc_refs.h rename to libavcodec/vvc/refs.h index eba4422fb4..ca04c62c67 100644 --- a/libavcodec/vvc/vvc_refs.h +++ b/libavcodec/vvc/refs.h @@ -23,7 +23,7 @@ #ifndef AVCODEC_VVC_VVC_REFS_H #define AVCODEC_VVC_VVC_REFS_H -#include "vvcdec.h" +#include "dec.h" int ff_vvc_output_frame(VVCContext *s, VVCFrameContext *fc, struct AVFrame *out, int no_output_of_prior_pics_flag, int flush); void ff_vvc_bump_frame(VVCContext *s, VVCFrameContext *fc); diff --git a/libavcodec/vvc/vvc_thread.c b/libavcodec/vvc/thread.c similarity index 99% rename from libavcodec/vvc/vvc_thread.c rename to libavcodec/vvc/thread.c index 9fad0ae85a..01c3ff75b1 100644 --- a/libavcodec/vvc/vvc_thread.c +++ b/libavcodec/vvc/thread.c @@ -26,12 +26,12 @@ #include "libavutil/mem.h" #include "libavutil/thread.h" -#include "vvc_thread.h" -#include "vvc_ctu.h" -#include "vvc_filter.h" -#include "vvc_inter.h" -#include "vvc_intra.h" -#include "vvc_refs.h" +#include "thread.h" +#include "ctu.h" +#include "filter.h" +#include "inter.h" +#include "intra.h" +#include "refs.h" typedef struct ProgressListener { VVCProgressListener l; diff --git a/libavcodec/vvc/vvc_thread.h b/libavcodec/vvc/thread.h similarity index 98% rename from libavcodec/vvc/vvc_thread.h rename to libavcodec/vvc/thread.h index 6c726744f8..d7543e6c63 100644 --- a/libavcodec/vvc/vvc_thread.h +++ b/libavcodec/vvc/thread.h @@ -23,7 +23,7 @@ #ifndef AVCODEC_VVC_VVC_THREAD_H #define AVCODEC_VVC_VVC_THREAD_H -#include "vvcdec.h" +#include "dec.h" struct AVExecutor* ff_vvc_executor_alloc(VVCContext *s, int thread_count); void ff_vvc_executor_free(struct AVExecutor **e); diff --git a/libavcodec/x86/vvc/vvcdsp_init.c b/libavcodec/x86/vvc/vvcdsp_init.c index 0d2c683f0f..23a3172c45 100644 --- a/libavcodec/x86/vvc/vvcdsp_init.c +++ b/libavcodec/x86/vvc/vvcdsp_init.c @@ -24,11 +24,10 @@ #include "config.h" #include "libavutil/cpu.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/vvc/vvcdec.h" -#include "libavcodec/vvc/vvc_ctu.h" -#include "libavcodec/vvc/vvcdsp.h" +#include "libavcodec/vvc/dec.h" +#include "libavcodec/vvc/ctu.h" +#include "libavcodec/vvc/dsp.h" #include "libavcodec/x86/h26x/h2656dsp.h" #if ARCH_X86_64 diff --git a/tests/checkasm/vvc_mc.c b/tests/checkasm/vvc_mc.c index d102e2ac9a..97f57cb401 100644 --- a/tests/checkasm/vvc_mc.c +++ b/tests/checkasm/vvc_mc.c @@ -22,9 +22,9 @@ #include #include "checkasm.h" -#include "libavcodec/vvc/vvc_ctu.h" -#include "libavcodec/vvc/vvc_data.h" -#include "libavcodec/vvc/vvcdsp.h" +#include "libavcodec/vvc/ctu.h" +#include "libavcodec/vvc/data.h" +#include "libavcodec/vvc/dsp.h" #include "libavutil/common.h" #include "libavutil/intreadwrite.h"