From patchwork Thu Apr 4 02:21: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: 47786 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp53377pzd; Wed, 3 Apr 2024 19:21:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVriUO2uZhfFEGII4GVIThVfXcvOtmibvm2C5v8U+0D144zj0eQVyRi7LudqOpdhooa1wf+7W1X6WX4LWA872cLr+HDRxXSQ43sTA== X-Google-Smtp-Source: AGHT+IHM5zd/feXScrV3bW9KAzUWklhA2zEUk7EOImDL+nr4lC0V5acwZMXocYMF9fJG0NpyLJdV X-Received: by 2002:a05:6402:5210:b0:56b:b570:4379 with SMTP id s16-20020a056402521000b0056bb5704379mr614984edd.4.1712197300236; Wed, 03 Apr 2024 19:21:40 -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 b11-20020a0564021f0b00b0056c526b191fsi7641250edb.119.2024.04.03.19.21.39; Wed, 03 Apr 2024 19:21:40 -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=GdmOvPRV; 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 A3C0568D130; Thu, 4 Apr 2024 05:21:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2059.outbound.protection.outlook.com [40.92.65.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E80568D07E for ; Thu, 4 Apr 2024 05:21:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X+nV1wA1S+wUrtHF+Z0JNhe9Mi560XWQCSvNh3vv3ZVg0wdZCGjxlHh5yBuh9W69kjN3kG/VU6fIhCwR3tPU8cD2aPcNzGT+bLdXRyG/0RGCAF6M0OwvCsiHGNgwasmP0xBIVQlJCB6zu6rAnHOEgdoGdfsAHggKv568qnEvvm3D/5PuMFAWvk8oM4WuTTvLC49z8hqIG5i5eHVtaG9+zoLgTm6k37aO+qMi1uVnYSIwR6jpD+912tlgfvpZvxC/AOpn0wgJpFwoZJIG/A5OjnjwuFVYxiH9cpFAGnA0om7RKmLlWtI4Vj5xIlOQyK6xcHNAyvt5n2cxtL6B8rsqyA== 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=NrOWghrigZkqqHO+ckJ6DTxtE8JPdFaUcEpx+EqIEq0=; b=bD1M0SA1PfB7/m1AP1IMqOEu3kJMCFtd+O/RfHzqcH0l/iBDwyAjLgXb9mSDgOzWDh0zaJ0RJBn5V/Ifi1apRpVuld4pjqggmtrpgm9U/O5rWcn+SsT6dI6ZEOomzN6ObMTYO12f3VJsAdyBSf0JvoQjjQTYrG/OA78qFxQVcljpTTZ9DzMXWMpVdn4/asMeA4VyUK+ezkOqIdzszX7SzeV/Vf0rByKUCyIv73Stx0uzeJXlxOUud5Aiai2gvNDqXJi1qSLR5CkHFVaofCtU1dLsYSFNm8n+d8fhVjeP5CjlVLNlSlAHLyVDdnsaQQ83eiFYdoU3lDJrrbBr27Fy8Q== 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=NrOWghrigZkqqHO+ckJ6DTxtE8JPdFaUcEpx+EqIEq0=; b=GdmOvPRVwEvQDzn4LJ5w2niQQExBu3lbiScUG4oPVCQA9v5Gu3+4bVkI4h7yFRm9JIaDieYhPIv1PqK5nyvv31ilAU9eW8eM4p37m+WGDLHM1dKf5j0J3NqjQ41dh4PbvDdJ3ZxoHLLBM9rLdKqRYmfxs8sSkhuLiBYE6q9lqCAwY2fVEtoahakv5pN3Ny3hKqzDhggzSe2BL/PzllrFJkk6R1na6eZZjYbqzI1Y0LtrUZL55+X3b4vddVkHTCnQaUkiVARjZzmWdEaMwab5MtInzMVdUOO/Rxfs64m1eyTcI1JAUSDsYKcRGdqDIqaVMlS2lKFnNt1BtFO38nEkXA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0107.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36e::5) 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:21:27 +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:21:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2024 04:21:20 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [ICKN8bN7HvY62MXARqeayyu76sfZI+e4lWcupuO4VG4=] X-ClientProxiedBy: FR0P281CA0037.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::19) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240404022120.3090385-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0107:EE_ X-MS-Office365-Filtering-Correlation-Id: 489e1992-b348-4f0e-a92b-08dc544dee6c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4KXMVyZkxmK8RoNCKkGTBBp3iqBE8wCvRkHD+77TDbmyeHDQ5xiHTs8wXKej1vTSd9D/LUe0cFhdoGyLUUPLu+XFxtqWjpp5AkHEV0evFR4k4PnJBVSKQ9nf7KpSMvxrBzXNMWSUGcFgGhOHO0dYNPcmHiyGLTdEKwbIFA9rDJfxnT8X1LXIUvvpv/Z25UvXp8/nNuUYIdUJt++U17GSbFkWqJ0KGCwIltRLZ7kwoghLmrYYrGIBeSA6X3Q4AGQ2qrkREf+meaK73CO2mDdyEbqw4sYnFh0+EhDFEI87JHmq9tmmrENSDujZQbGHrSjwH64T3/c2/KP1+X3sYKCfCCehQiBglcsV2o0Fy+mqToS1vPdrvQ2QRVAhdutVd3zXdDYp2DeMa1WGRyki1ib+TUDbcfZNtrUqXUT/M+nyeXT7BePSO+W2CYBenxIF4m6WU4VdyQwbN4NJFGB1g8ws8x38FkzN2h+14nb0dsnO2rAduXiGMRGChyRcOC5eNiuEAxH9rwWODH7UE077SHg/Vg4SA6+wBkTnJGxePVrSMk/RvPdviPEXbGJZ/n2kILFD+E4viin88SqUPCGWyHi21mEVD6Mq9Pqtp9LPhADQvoaY6gH2DaOIckY0VuCz8t5R X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0DFgJl9GH5gjYJwdEDvTDAgdWcDLe5mq3nA0Su7B2l5fPp9K/204jwQn8gF7X9DemS2PbD0xiZKdsKNYKcGQP7YUFJo4i5KJPkkRKpWfLCnj3lUz5R5WDdCgpsr0GPVMvxzCnv0OtYEwPxjknrPyGT+wO8GCzVrmDPwY8qk8jswMpuqQnv/S9QkPpCr6VoNzWUCd4JACtgZtemKEbWE6aRwnMUjUfEV1U8HUYoHWujomR/R1cv1XZJH85eV2y9ZM1T8/YQglagWN52R8ygqEP8jg+4jmnFICdEp2RsSuRxSTglU1YwHjm1iffrcEwZvM8lwKTummLh0Ka6D+AjzVNxOUcV2vmqgcwv8rMNSt2hRZ4qm/eMrOJrq5U0NZaO3ouRGRCG/bHR8lyKh4YIr4lHSoyw1E1brIKsi/hXSWd9UHspLI6HN+yCFPjyepmH6ZwpdsbxH1wjOM0Wsc1wGii3XVNWFSLvKuRPVyVgUyytbkBZO/V+pBxiEb7p7X+9mwyWwdT5jpOvEmRpm3urMAKrJSAgUVphP7i6pn5K176DB6IkCsHCpEQs+2MxdhzTZxn1Vore6Owq2RHUESfycpUEaen8Lohm7ztuu6G5h+dI4f6ZYJJGaJ1gLNE8XQqq6FmS8GNQeNMEqnaEQhwNaVL39xWMoU0nFf5CrbQ2nEwy3WU6dahrSHXEbyKAH54wTGlEUsfQtluWDUL85XHCSeTlFOripuogza7f/W9k003en2fyF5m1dArR/mTwDoI52JMwyVc2Ns9cXTLFV1/iytb75P1YLxgXiNmHv5P5LubWsLenk3cVA6NStg/GoPK2zsY2WeZVLy8/jeZJE9yvWelzMo8c7oKsn6Oy4Xozy6v87hhsygcXsESL6RgZVcWfRaQ5/g1MF/VWvDZknv51++iYCaR7dg85XktZ/+UwJadm1DU6fF33UWeIHZmqTR+Ah9EgXYQUWNLxhxC/fJluz6cb4t3OlgQ1ViMwydvJlC6JW4hRQ/Rm0NOadmqT7YPwRkB31A9doLVLsG2+MURYh+Jka9q+TjeBACa2a1JqwtNzf+bpRpfoAeL5LL2A7r5SJ2jX2TthiguQjctr32pC+WjB2bhzjK5jxbXBmx6313+Fmlp2wuCpZsWI7Y2UL5qy7uwEfILEQ67DeUB6Y+PS3v1pZTW6QHiJuA1Vhp/JA9UnAGTtSqGCaZY7TF4r02Thv8P3lmR4qM7iV8zbsZHzwAcwZgfzVsNFTZLVT6B4JkXydFGhZJOXGj6iYFGORpgEaDcn8E4UHSFNlJJj9bp1VJ/Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 489e1992-b348-4f0e-a92b-08dc544dee6c 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:21:27.1150 (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: AM8P250MB0107 Subject: [FFmpeg-devel] [PATCH v2 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: dBoAV6+v2Li1 A namespace is unnecessary here given that all these files are already in the vvc subfolder. Signed-off-by: Andreas Rheinhardt --- Now also fixing the header inclusion guards. libavcodec/vvc/Makefile | 28 +++++++++---------- libavcodec/vvc/{vvc_cabac.c => cabac.c} | 6 ++-- libavcodec/vvc/{vvc_cabac.h => cabac.h} | 8 +++--- libavcodec/vvc/{vvc_ctu.c => ctu.c} | 8 +++--- libavcodec/vvc/{vvc_ctu.h => ctu.h} | 8 +++--- libavcodec/vvc/{vvc_data.c => data.c} | 2 +- libavcodec/vvc/{vvc_data.h => data.h} | 6 ++-- libavcodec/vvc/{vvcdec.c => dec.c} | 10 +++---- libavcodec/vvc/{vvcdec.h => dec.h} | 10 +++---- libavcodec/vvc/{vvcdsp.c => dsp.c} | 12 ++++---- libavcodec/vvc/{vvcdsp.h => dsp.h} | 6 ++-- .../vvc/{vvcdsp_template.c => dsp_template.c} | 10 +++---- libavcodec/vvc/{vvc_filter.c => filter.c} | 8 +++--- libavcodec/vvc/{vvc_filter.h => filter.h} | 8 +++--- ...vc_filter_template.c => filter_template.c} | 0 libavcodec/vvc/{vvc_inter.c => inter.c} | 8 +++--- libavcodec/vvc/{vvc_inter.h => inter.h} | 8 +++--- ...{vvc_inter_template.c => inter_template.c} | 0 libavcodec/vvc/{vvc_intra.c => intra.c} | 8 +++--- libavcodec/vvc/{vvc_intra.h => intra.h} | 8 +++--- ...{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} | 6 ++-- libavcodec/vvc/{vvc_mvs.c => mvs.c} | 8 +++--- libavcodec/vvc/{vvc_mvs.h => mvs.h} | 8 +++--- libavcodec/vvc/{vvc_ps.c => ps.c} | 6 ++-- libavcodec/vvc/{vvc_ps.h => ps.h} | 6 ++-- libavcodec/vvc/{vvc_refs.c => refs.c} | 2 +- libavcodec/vvc/{vvc_refs.h => refs.h} | 8 +++--- libavcodec/vvc/{vvc_thread.c => thread.c} | 12 ++++---- libavcodec/vvc/{vvc_thread.h => thread.h} | 8 +++--- libavcodec/x86/vvc/vvcdsp_init.c | 7 ++--- tests/checkasm/vvc_mc.c | 6 ++-- 34 files changed, 126 insertions(+), 127 deletions(-) rename libavcodec/vvc/{vvc_cabac.c => cabac.c} (99%) rename libavcodec/vvc/{vvc_cabac.h => cabac.h} (98%) 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} (97%) rename libavcodec/vvc/{vvcdec.c => dec.c} (99%) rename libavcodec/vvc/{vvcdec.h => dec.h} (98%) rename libavcodec/vvc/{vvcdsp.c => dsp.c} (96%) rename libavcodec/vvc/{vvcdsp.h => dsp.h} (98%) 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} (94%) 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} (90%) 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} (93%) 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} (94%) rename libavcodec/vvc/{vvc_mvs.c => mvs.c} (99%) rename libavcodec/vvc/{vvc_mvs.h => mvs.h} (95%) rename libavcodec/vvc/{vvc_ps.c => ps.c} (99%) rename libavcodec/vvc/{vvc_ps.h => ps.h} (99%) rename libavcodec/vvc/{vvc_refs.c => refs.c} (99%) rename libavcodec/vvc/{vvc_refs.h => refs.h} (94%) rename libavcodec/vvc/{vvc_thread.c => thread.c} (99%) rename libavcodec/vvc/{vvc_thread.h => thread.h} (90%) 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 98% rename from libavcodec/vvc/vvc_cabac.h rename to libavcodec/vvc/cabac.h index 172ab272ff..e9bc98e23a 100644 --- a/libavcodec/vvc/vvc_cabac.h +++ b/libavcodec/vvc/cabac.h @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVC_CABAC_H -#define AVCODEC_VVC_VVC_CABAC_H +#ifndef AVCODEC_VVC_CABAC_H +#define AVCODEC_VVC_CABAC_H -#include "vvc_ctu.h" +#include "ctu.h" int ff_vvc_cabac_init(VVCLocalContext *lc, int ctu_idx, int rx, int ry); @@ -123,4 +123,4 @@ int ff_vvc_end_of_slice_flag_decode(VVCLocalContext *lc); int ff_vvc_end_of_tile_one_bit(VVCLocalContext *lc); int ff_vvc_end_of_subset_one_bit(VVCLocalContext *lc); -#endif //AVCODEC_VVC_VVC_CABAC_H +#endif //AVCODEC_VVC_CABAC_H 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..4e38ecf54a 100644 --- a/libavcodec/vvc/vvc_ctu.h +++ b/libavcodec/vvc/ctu.h @@ -20,13 +20,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVC_CTU_H -#define AVCODEC_VVC_VVC_CTU_H +#ifndef AVCODEC_VVC_CTU_H +#define AVCODEC_VVC_CTU_H #include "libavcodec/cabac.h" #include "libavutil/mem_internal.h" -#include "vvcdec.h" +#include "dec.h" #define MAX_CTU_SIZE 128 @@ -483,4 +483,4 @@ void ff_vvc_ctu_free_cus(CTU *ctu); int ff_vvc_get_qPy(const VVCFrameContext *fc, int xc, int yc); void ff_vvc_ep_init_stat_coeff(EntryPoint *ep, int bit_depth, int persistent_rice_adaptation_enabled_flag); -#endif // AVCODEC_VVC_VVC_CTU_H +#endif // AVCODEC_VVC_CTU_H 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 97% rename from libavcodec/vvc/vvc_data.h rename to libavcodec/vvc/data.h index 1f9a463bc7..e493b9e0e6 100644 --- a/libavcodec/vvc/vvc_data.h +++ b/libavcodec/vvc/data.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVC_DATA_H -#define AVCODEC_VVC_VVC_DATA_H +#ifndef AVCODEC_VVC_DATA_H +#define AVCODEC_VVC_DATA_H #include @@ -77,4 +77,4 @@ extern const uint8_t ff_vvc_alf_aps_class_to_filt_map[25]; const uint8_t* ff_vvc_get_mip_matrix(const int size_id, const int mode_idx); -#endif /* AVCODEC_VVC_VVC_DATA_H */ +#endif /* AVCODEC_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 98% rename from libavcodec/vvc/vvcdec.h rename to libavcodec/vvc/dec.h index aa3d715524..4dacefc06a 100644 --- a/libavcodec/vvc/vvcdec.h +++ b/libavcodec/vvc/dec.h @@ -21,14 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVCDEC_H -#define AVCODEC_VVC_VVCDEC_H +#ifndef AVCODEC_VVC_DEC_H +#define AVCODEC_VVC_DEC_H #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 @@ -226,4 +226,4 @@ typedef struct VVCContext { int nb_delayed; ///< delayed frames } VVCContext ; -#endif /* AVCODEC_VVC_VVCDEC_H */ +#endif /* AVCODEC_VVC_DEC_H */ 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 98% rename from libavcodec/vvc/vvcdsp.h rename to libavcodec/vvc/dsp.h index f4fb3cb7d7..9810ac314c 100644 --- a/libavcodec/vvc/vvcdsp.h +++ b/libavcodec/vvc/dsp.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVCDSP_H -#define AVCODEC_VVC_VVCDSP_H +#ifndef AVCODEC_VVC_DSP_H +#define AVCODEC_VVC_DSP_H #include #include @@ -169,4 +169,4 @@ void ff_vvc_dsp_init(VVCDSPContext *hpc, int bit_depth); void ff_vvc_dsp_init_x86(VVCDSPContext *hpc, const int bit_depth); -#endif /* AVCODEC_VVC_VVCDSP_H */ +#endif /* AVCODEC_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 94% rename from libavcodec/vvc/vvc_filter.h rename to libavcodec/vvc/filter.h index 9597437d83..03cc74e071 100644 --- a/libavcodec/vvc/vvc_filter.h +++ b/libavcodec/vvc/filter.h @@ -20,10 +20,10 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVC_FILTER_H -#define AVCODEC_VVC_VVC_FILTER_H +#ifndef AVCODEC_VVC_FILTER_H +#define AVCODEC_VVC_FILTER_H -#include "vvcdec.h" +#include "dec.h" /** * lmcs filter for the CTU @@ -70,4 +70,4 @@ void ff_vvc_alf_copy_ctu_to_hv(VVCLocalContext* lc, int x0, int y0); */ void ff_vvc_alf_filter(VVCLocalContext *lc, const int x0, const int y0); -#endif // AVCODEC_VVC_VVC_CTU_H +#endif // AVCODEC_VVC_CTU_H 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 90% rename from libavcodec/vvc/vvc_inter.h rename to libavcodec/vvc/inter.h index 61fc44b3a0..50f2dbb66b 100644 --- a/libavcodec/vvc/vvc_inter.h +++ b/libavcodec/vvc/inter.h @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVC_INTER_H -#define AVCODEC_VVC_VVC_INTER_H +#ifndef AVCODEC_VVC_INTER_H +#define AVCODEC_VVC_INTER_H -#include "vvc_ctu.h" +#include "ctu.h" /** * Loop entire CTU to predict all inter coding blocks @@ -39,4 +39,4 @@ int ff_vvc_predict_inter(VVCLocalContext *lc, int rs); */ void ff_vvc_predict_ciip(VVCLocalContext *lc); -#endif // AVCODEC_VVC_VVC_INTER_H +#endif // AVCODEC_VVC_INTER_H 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 93% rename from libavcodec/vvc/vvc_intra.h rename to libavcodec/vvc/intra.h index 6b674008f9..8a02699135 100644 --- a/libavcodec/vvc/vvc_intra.h +++ b/libavcodec/vvc/intra.h @@ -19,10 +19,10 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVC_INTRA_H -#define AVCODEC_VVC_VVC_INTRA_H +#ifndef AVCODEC_VVC_INTRA_H +#define AVCODEC_VVC_INTRA_H -#include "vvc_ctu.h" +#include "ctu.h" /** * reconstruct a CTU @@ -46,4 +46,4 @@ int ff_vvc_intra_inv_angle_derive(int pred_mode); int ff_vvc_wide_angle_mode_mapping(const CodingUnit *cu, int tb_width, int tb_height, int c_idx, int pred_mode_intra); -#endif // AVCODEC_VVC_VVC_INTRA_H +#endif // AVCODEC_VVC_INTRA_H 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 94% rename from libavcodec/vvc/vvc_itx_1d.h rename to libavcodec/vvc/itx_1d.h index d9094f524b..59495827b8 100644 --- a/libavcodec/vvc/vvc_itx_1d.h +++ b/libavcodec/vvc/itx_1d.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVC_ITX_1D_H -#define AVCODEC_VVC_VVC_ITX_1D_H +#ifndef AVCODEC_VVC_ITX_1D_H +#define AVCODEC_VVC_ITX_1D_H #include #include @@ -49,4 +49,4 @@ vvc_itx_1d_fn(ff_vvc_inv_dct8_32); void ff_vvc_inv_lfnst_1d(int *v, const int *u, int no_zero_size, int n_tr_s, int pred_mode_intra, int lfnst_idx, int log2_transform_range); -#endif // AVCODEC_VVC_VVC_ITX_1D_H +#endif // AVCODEC_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 95% rename from libavcodec/vvc/vvc_mvs.h rename to libavcodec/vvc/mvs.h index 78ad17c303..3f0c8b08e9 100644 --- a/libavcodec/vvc/vvc_mvs.h +++ b/libavcodec/vvc/mvs.h @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVC_MVS_H -#define AVCODEC_VVC_VVC_MVS_H +#ifndef AVCODEC_VVC_MVS_H +#define AVCODEC_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); @@ -45,4 +45,4 @@ MvField* ff_vvc_get_mvf(const VVCFrameContext *fc, const int x0, const int y0); void ff_vvc_set_mvf(const VVCLocalContext *lc, const int x0, const int y0, const int w, const int h, const MvField *mvf); void ff_vvc_set_intra_mvf(const VVCLocalContext *lc, int dmvr); -#endif //AVCODEC_VVC_VVC_MVS_H +#endif //AVCODEC_VVC_MVS_H 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 99% rename from libavcodec/vvc/vvc_ps.h rename to libavcodec/vvc/ps.h index f60d8b81c6..3efb097b41 100644 --- a/libavcodec/vvc/vvc_ps.h +++ b/libavcodec/vvc/ps.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVC_PS_H -#define AVCODEC_VVC_VVC_PS_H +#ifndef AVCODEC_VVC_PS_H +#define AVCODEC_VVC_PS_H #include "libavcodec/cbs_h266.h" #include "libavcodec/vvc.h" @@ -263,4 +263,4 @@ int ff_vvc_decode_sh(VVCSH *sh, const VVCFrameParamSets *ps, const CodedBitstrea void ff_vvc_frame_ps_free(VVCFrameParamSets *fps); void ff_vvc_ps_uninit(VVCParamSets *ps); -#endif /* AVCODEC_VVC_VVC_PS_H */ +#endif /* AVCODEC_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 94% rename from libavcodec/vvc/vvc_refs.h rename to libavcodec/vvc/refs.h index eba4422fb4..8ae33d4a9a 100644 --- a/libavcodec/vvc/vvc_refs.h +++ b/libavcodec/vvc/refs.h @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVC_REFS_H -#define AVCODEC_VVC_VVC_REFS_H +#ifndef AVCODEC_VVC_REFS_H +#define AVCODEC_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); @@ -55,4 +55,4 @@ void ff_vvc_report_frame_finished(VVCFrame *frame); void ff_vvc_report_progress(VVCFrame *frame, VVCProgress vp, int y); void ff_vvc_add_progress_listener(VVCFrame *frame, VVCProgressListener *l); -#endif // AVCODEC_VVC_VVC_REFS_H +#endif // AVCODEC_VVC_REFS_H 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 90% rename from libavcodec/vvc/vvc_thread.h rename to libavcodec/vvc/thread.h index 6c726744f8..55bb4ea244 100644 --- a/libavcodec/vvc/vvc_thread.h +++ b/libavcodec/vvc/thread.h @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVC_THREAD_H -#define AVCODEC_VVC_VVC_THREAD_H +#ifndef AVCODEC_VVC_THREAD_H +#define AVCODEC_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); @@ -33,4 +33,4 @@ void ff_vvc_frame_thread_free(VVCFrameContext *fc); void ff_vvc_frame_submit(VVCContext *s, VVCFrameContext *fc); int ff_vvc_frame_wait(VVCContext *s, VVCFrameContext *fc); -#endif // AVCODEC_VVC_VVC_THREAD_H +#endif // AVCODEC_VVC_THREAD_H 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"