From patchwork Mon Jul 24 13:17:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42943 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp1914255pzb; Mon, 24 Jul 2023 06:17:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlEv4sZeAzvxZ8i6GA1sW+NRSCxNaMBqmhu7ZM0AlTNJYD3MZ5Gy1Kgzs588Y8G6iGL7M7o0 X-Received: by 2002:a17:906:3095:b0:989:450:e585 with SMTP id 21-20020a170906309500b009890450e585mr8514049ejv.45.1690204626833; Mon, 24 Jul 2023 06:17:06 -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 j23-20020a170906095700b00993690d17a2si6608773ejd.5.2023.07.24.06.17.05; Mon, 24 Jul 2023 06:17:06 -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=KJCfQezp; 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 E674A68C76D; Mon, 24 Jul 2023 16:17:01 +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-am6eur05olkn2098.outbound.protection.outlook.com [40.92.91.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E8AB68C5F7 for ; Mon, 24 Jul 2023 16:16:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JqFyF8lMvf/8g7IwO46JQVHcUs3kdcYCf6izlEdeRH4R0a0QxRW1qyIBztzF8H48HzFEb5CJ9oGX6wowk1W6getAS2dY76EUrbLxLLuS8RLjMK9R0AaebV5taBusaLYSYxgXBN8gc5Z0VpCnn02AFURy6PVsuhSpDdz0ED1oBZjsBtyCBA+xxugMmt9O8Bom9m0rXRW4/J0UI/uQF1OWCCwUKnludb+TLuL+4rEIxPrQ9c9HAw3xpPn2VoTWDb99MHuIB7l2Ietp3pAg9IZEO0x/Ahu6nTYqDYALcYeZSUIf6+b4MXx6CpPwi4pKn94fw+JtPsyHuW7i9jmAgCHH9A== 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=HMO5a7vKUBHCWfR4PFFyNmLTxQubDL+LH2bjKsEkw88=; b=ZqDXijhxyZL1yt3HBiU2kwZP99tYaKGNszBD3ZYtcMlcQB0Px0qiDTEXfuLU3hBLkwSd+Q4kJ8sTPnjn8tgPsJOpmg3Luw/uRtvc28tYh/yDKiuQNxtDipa7LkPRM4+V31zlErXMPcK1MiaYCSmdvFar/pGOhZPog2pUsmbDvaoKpkDeZ9rB3BRaVIIveVwHDd04mi+AB0cCoBvMFCJwElxF73vnnpQ2nUN5N9US3UyJgwD0H2x6UFJ9oEtWjlGAMxgh9McsqB4XqeVk1vf2gv5JufL1r086HLv6WhLEzMaZT3gwnQSp8q1VWv/h+2x4bCL6rlVYDBOKTUQ/6WLPzg== 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=HMO5a7vKUBHCWfR4PFFyNmLTxQubDL+LH2bjKsEkw88=; b=KJCfQezp+OsAEYCW/JhtOulfQUDFTzObrqvt1VFR6Rx0LfUoVZOaTSFWzmjxu6zjsnolVsPG8Lf/OWgNmjjIbdkdvHW877tugohL1fH53XPfiDZ6qtu164lfFp4/f2TlHmbrOiVqXeKw8GkCElkeP/g9AWM3Q45zG63Z3SJ9SHw0PROXBJH9JlOCI0vMKFFIKRta/IiwLhZu/bgR1eaAPtZjMAG9cpr6bFhVv9bTCrHm/FtBhgV0xXs9HOP936u+hERQ+Hfx2rP/yOk0HTvA4EnsHPaSca5km9K0sVP5ULO2AS/3R8IldrS6ysWGLK2/FtelWP9/MgjI4OfDP07eaQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0173.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32; Mon, 24 Jul 2023 13:16:52 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6609.032; Mon, 24 Jul 2023 13:16:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jul 2023 15:17:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [K8y0nMY2OKlsAoP+nSfsM5m6MJoD8qp/] X-ClientProxiedBy: ZR2P278CA0002.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230724131738.2191337-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0173:EE_ X-MS-Office365-Filtering-Correlation-Id: 1fc66df2-46c5-4e06-754c-08db8c483ec6 X-MS-Exchange-SLBlob-MailProps: Vs63Iqe4sQklqWC7ylRS4aEZ0Gw5Ix+DkUw/m+6g54jkdg99moIXWqaXBXJXn7BxJWOUPpUfhwPY//uWOq2FuCdfQI1mWlUEkHgvunsSDu9SbmnUZ2xWjvhiNuvk5AAgI7YFqMiaM/XjR7fLqqU502QZcnQm+LxIQ0a1rmk4LuoI9yI75+VXMUsU1Qs7SHstElA0HJVcv3tXg/Z+ZLB87ytPtlOLayXbBN4t326LYMY73yAY+pESfixP8RyxPZsKcOXLO89VdLN4ay0j4+Gmp/+0Sb+90y3q/PFdCGz8uOUZ7029tZFwVh7X5w5cPMXwrM2j+ODQauusbwgOObljQQwvvQxIIXwdRn707bEtaS6optMgn2IX1MZxGGm6ZzyEsxccRpY7VLBqCyV3s+bG/UcWECiDZ34C57q73S2VpqLabSDY6jVvVypxH08ZwEyjFb4oNCzMzf4DYKayW9mNZpb051PPUkWM87F2Lhpl+gH9uZmja5p6YM8LGh+82F97W/m6FwkL4f1wOpzhazggIvHUUqStF80xgpAGOPWoVZ8VBiEjlhFRLUEm8O98Ha8OeOnptXydRwe+V/8kiutLiPodWgutbwv+sL63fogD2QPNy+LXft2l4spQXIeDuawrKE2N5spj6BjQ3GioPKFVinhEcJziriGkpOOjVVjDGMbBuIDqt643HNpg3mnAImFefSI2XbDkH3CNoS5gX/mMyzNRL9hadBsz031Z1LP7MLk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: U4Rv2xUXUae847qQVwwkbfJV7ZxkVglkDOzehXiRXbOSeQZfgwQR40wYJb06t8D99KfmtYs91MpSVw42oMieGqrBjBy87K5xHNlIndFEKSwJbic+v1V6UlYZM2cJZXYknX6LQ7nOHkENVAZ0v5Q2aS2VKErDeMbtyg+V0k+oIiMGt/f2uHJp7yFR5dMZ3YTcZdD69HINpl7sIrqpEQLvmHCu6Hg7UF8rs5J5/ocR4L9urx6RyPxYa46+mzPLpf9aiTR7k7cIIMvVW4BZPpHccwYbWwLyq1QYd0slGzaxxUK7uyMEQlwvdf8ngwZ8aOK2sTG2WBFlNnY3SZVMDjW/vRLhl+VDd9M88l5zxIDURNOPIYyEj7tsUYbY4cPAagQ//V/mfwQzj/s0sr3ccC+WpM/IVOzFtdo0D/9uTzhKBGu0IHokpEyX3e8eI8IngE1J/MONTXBc1/E19C+EW25rJ8VeAjC8blZBQ41VAtOHu86zNSiFxcQLH1nyZDfBLUgjhp6AQvPNdf6ShuO+U7v7R495813HydKZXmpwoS7zqDwPrvodqoO1qtA9EQKrBNubG0yQyJDN8i2FUlBnzsrje8tfNKwGhMSJ1iCj1QKSnHGPNvqfPoaK7HRc5C8ELJIe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rGB1dsrZCtWch12Y6t6fPlV62eR5rC4ekGFGUhvSloDa20WughkwTZJW01b0egAEzew8pNjGPlH02/KHK2gjy87XHMpQCpvdWjOEE3PwxUynShhJx6kU+H+fDo2HbrToZ0cOh0GeNsXhUHQRjMXaebt7TQo5I6XiER591DBUCYV5EgCKIikIQ1wT57mA6sW8cg89vfdRuHXtU5DmNmEDTaEcbrUd6TKMNGt89VUSRhWuEGfA9AAffqST+YDGUUymJUKmH3RMtlovWO6Z4tCSjZW2nHM+FTeuJPZ48ni1Uk63J2uEwmTfskNCdmwUhr9ireNrnmdenWrnPXK2JCw1NmAzI28h12Dc1C0rpJWbkWj/1ZWzD9+jgfvepuBCBOXUOZ0IPx+Dp5oOoEQMjfSOEkS078VxRTTjeBZnvEIqyhn1Jwz0rWyGAqBjUdhR+De8SC4STekXhPwS8BcD+KIBY7ukJrIbjOwE1pjuwzLzVdCcOIkOXL6dpoksdPKxMja8lhuPvGtj9jUNvbq7SPlH7yjRfKFm1n2WJuHHXxdw9DzboZgwpBhxSo0esytCpEFAd60qFrw0iVnpx0SVHZnytxcMPG9iUoP5iHOMbwooxrUpDxCuH4sAjAT3cAmKB5yde5QIr2Qw7xLFyfYImBpcXSc6/mwWF6fHJg0akWBN+SUeZWfKLPpUZxQgEpuq2x+YCqNSYTwJ0474TZjowj5WJ8G0TTnZ6VpeUk6JLPxESxegmsHdIvRBqBPm5nXiOp7cqplk+fm6pvV/HOuQLgtZ+HVt4HlRWIZVZIToX1HgmIjLqUDoE9QbPAbCMPk555ksJ6Px7qmonnDhTyj4yu21YToJOGjN3kWBRAauTiuiwuGhm8Rs7G0/n5lbXXBcEBZR86MiVOZeMdlLioas1hyHlXiT6rZXwCd5TTM7u/HDqa12av/fAqQ4XCUaeGn0gEJIMENu9K97wr8CBhqoJA4FWgICOnXYqOlhTFyxSnCzDjXTCQfPuVZ9jYEMBl6ookt7UXN8/I3Ws7ZdNKvUncIlfUvOyJJU47A/Ukk9JRZi89WElqLt23xNuTNfQr3e8FYmgF0b3g+WmZ1/8ptR1YDpFPnHLB471jkqRK0vjJpkU9gI8bPTD6yj4Cm6BuLKvwAblEt4ZkT+pV3+fa/9Yazdl9kGl23OQZre79XEuJwq9NOYxHhTSm+PllzMA/h8jMYiFcsrvjdAi8+iziErhgqiQ9wj7no4m15dZt7pmqAANvFrFj8UV3zJ9DbZKvBm4ay9 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1fc66df2-46c5-4e06-754c-08db8c483ec6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2023 13:16:52.4018 (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: DU2P250MB0173 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/dct: Move fdct function declarations to fdctdsp.h 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: uzvPdcB4ahSI It is the more proper place for them given that this is the only API using them. Signed-off-by: Andreas Rheinhardt --- libavcodec/asvenc.c | 1 - libavcodec/dct.h | 7 ------- libavcodec/fdctdsp.c | 1 - libavcodec/fdctdsp.h | 7 +++++++ libavcodec/jfdctfst.c | 2 +- libavcodec/jfdctint_template.c | 2 +- libavcodec/mpegvideo_enc.c | 1 - libavcodec/tests/dct.c | 1 + 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index 4a14bcf8fa..50da46738c 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -33,7 +33,6 @@ #include "asv.h" #include "avcodec.h" #include "codec_internal.h" -#include "dct.h" #include "encode.h" #include "fdctdsp.h" #include "mpeg12data.h" diff --git a/libavcodec/dct.h b/libavcodec/dct.h index 041e8169ce..05bff51580 100644 --- a/libavcodec/dct.h +++ b/libavcodec/dct.h @@ -52,13 +52,6 @@ void ff_dct_end (DCTContext *s); void ff_dct_init_x86(DCTContext *s); -void ff_fdct_ifast(int16_t *data); -void ff_fdct_ifast248(int16_t *data); -void ff_jpeg_fdct_islow_8(int16_t *data); -void ff_jpeg_fdct_islow_10(int16_t *data); -void ff_fdct248_islow_8(int16_t *data); -void ff_fdct248_islow_10(int16_t *data); - void ff_j_rev_dct(int16_t *data); void ff_j_rev_dct4(int16_t *data); void ff_j_rev_dct2(int16_t *data); diff --git a/libavcodec/fdctdsp.c b/libavcodec/fdctdsp.c index 5306c9d047..f8ba17426c 100644 --- a/libavcodec/fdctdsp.c +++ b/libavcodec/fdctdsp.c @@ -18,7 +18,6 @@ #include "libavutil/attributes.h" #include "avcodec.h" -#include "dct.h" #include "faandct.h" #include "fdctdsp.h" #include "config.h" diff --git a/libavcodec/fdctdsp.h b/libavcodec/fdctdsp.h index 3e1f683b9e..82edf8b3bb 100644 --- a/libavcodec/fdctdsp.h +++ b/libavcodec/fdctdsp.h @@ -34,4 +34,11 @@ void ff_fdctdsp_init_ppc(FDCTDSPContext *c, AVCodecContext *avctx, void ff_fdctdsp_init_x86(FDCTDSPContext *c, AVCodecContext *avctx, unsigned high_bit_depth); +void ff_fdct_ifast(int16_t *data); +void ff_fdct_ifast248(int16_t *data); +void ff_jpeg_fdct_islow_8(int16_t *data); +void ff_jpeg_fdct_islow_10(int16_t *data); +void ff_fdct248_islow_8(int16_t *data); +void ff_fdct248_islow_10(int16_t *data); + #endif /* AVCODEC_FDCTDSP_H */ diff --git a/libavcodec/jfdctfst.c b/libavcodec/jfdctfst.c index 805e05808c..946b12f379 100644 --- a/libavcodec/jfdctfst.c +++ b/libavcodec/jfdctfst.c @@ -68,7 +68,7 @@ #include #include "libavutil/attributes.h" -#include "dct.h" +#include "fdctdsp.h" #define DCTSIZE 8 #define GLOBAL(x) x diff --git a/libavcodec/jfdctint_template.c b/libavcodec/jfdctint_template.c index 67fb77b5e1..ca17300c32 100644 --- a/libavcodec/jfdctint_template.c +++ b/libavcodec/jfdctint_template.c @@ -60,7 +60,7 @@ */ #include "libavutil/common.h" -#include "dct.h" +#include "fdctdsp.h" #include "bit_depth_template.c" diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 9bdf5dbe07..64e66ae958 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -43,7 +43,6 @@ #include "libavutil/opt.h" #include "libavutil/thread.h" #include "avcodec.h" -#include "dct.h" #include "encode.h" #include "idctdsp.h" #include "mpeg12codecs.h" diff --git a/libavcodec/tests/dct.c b/libavcodec/tests/dct.c index c847af2f11..e8d0b8dd1d 100644 --- a/libavcodec/tests/dct.c +++ b/libavcodec/tests/dct.c @@ -43,6 +43,7 @@ #include "libavutil/time.h" #include "libavcodec/dct.h" +#include "libavcodec/fdctdsp.h" #include "libavcodec/idctdsp.h" #include "libavcodec/simple_idct.h" #include "libavcodec/xvididct.h"