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 30D0042C04 for ; Sat, 29 Jul 2023 00:24:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 651D268C88F; Sat, 29 Jul 2023 03:24:51 +0300 (EEST) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2097.outbound.protection.outlook.com [40.92.48.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 413FA68C708 for ; Sat, 29 Jul 2023 03:24:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oPQj/B8XFRwNwcw921XvMTEGsLpUXQyiCAXZh9QMzIzCLmW9z+uvVnYWJmWdbLTd/+pLNHq/NGTDNWIWBTgLnwrEFY8pIsgHg0/zCCFpnDAdmHjfDEnsAlc2SxXU4hEx5JopNU7O8oJpUzT5HYaZqFGuCe6Xm814n/NuBlJUw45FfMyklxX3uxgVBHRLrabKII71Cit5knNzRxb43wU4rzULXsWuoaEEEvgSzotXHhZOxBEJm13eLTshBpdRahsAWpgkfjOoyHj6UCwdGLnOCPYLSoaHfxz7zzliTNnTG8sUyXeThXI5mFQ5DOs114Zv5IdnDzd+ZjjucVZ6jdjX6g== 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=BO74Fw6/M5/xAWYqlPoAAclk9ct9bwVHHDxlKUfPaRU=; b=odcLvm+fWiRV3758eYFnR0+9bjwfx01pPHB/DjTFRrR+2wcCiHyKhkoZ6HKydM7PRKP9veUj4nWPGROS+kUUd1e0MP2wdw+RMebKJiEhHU1ZFqpOATrJRwINPZp16fa9I73V8BsfS1Ck/JkGhXcp7OEYquSv3Opb01tQPJ1oJtKDf65ukyzzGtMNabEw7KoUMyJfT0h6FoCd9PHrR1zRARVrXkmHlcutGggyemzrm9Yia8vXLgEm0xakNqrOmnC3wFCYKpNKt02sEej251XydL04+26z3D6QRff+86hQUxwi7cA/lw3cWa2xFrey5wElgWfQdnWQsM+LO4tmrStYDQ== 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=BO74Fw6/M5/xAWYqlPoAAclk9ct9bwVHHDxlKUfPaRU=; b=mEFTKlRAMT1WzKDrUqhs/BuE5EWSF4YZxopGR71nv0mvmeFGGZIlbbSlpAD/fJvWWNitlMtAnpEXbtv5zIKtvEu449tY/0wTTBLB8JO03B8xt+F96nAi0FyU9aIon0i9yXnFU+tpHFBYFrrRTveetXdWLXWpxMJvZZogps31bbUcWWLukh53eO5TnGPiWbJPyV61imGdjNNef441raYyj4Wo8yaP2wKPjD3SbihVT3TA7tZdfO8Bs1cL5mM92saBUcZxBlnU3KKwZT1Ib9ZePDsgkeTnRsXqGp3e43UW3PpGXLkLX14eLtzO8UnM8i9PMclSG6SUodSSlsDKpBfR2A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0228.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29; Sat, 29 Jul 2023 00:24:42 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.039; Sat, 29 Jul 2023 00:24:41 +0000 Message-ID: Date: Sat, 29 Jul 2023 02:25:51 +0200 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [hpuQtJ8Q3kAYg8PUQcy6BnedC62MHHH/] X-ClientProxiedBy: FR0P281CA0085.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <3cc2e1b4-afd4-7474-747d-c864e89c8b5f@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0228:EE_ X-MS-Office365-Filtering-Correlation-Id: 011f4457-90aa-4c60-dbb3-08db8fca3395 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ja0qIJgPwUoqDfSbxpOkyJHlczn2iH40Wf1x52F609nseGQ6Ve6zFvPYW6JiYu3HODACLrRlvwTqpXHf9NJ/fw4qfhNm56OBGNMBjtgS3K6qOr51veg7RgkcFXMnPmOWCeeK/H5iNREAO3ugqutyxD4HQIwIdQv4oCRjUR+4glFqOqB3ubj+v12c+L0G1kejrGIWOxUwXoR1nxNn1S9qKgu4nFtfmJwhljRFtabyJk+rNOjT++U9jLjxz6mvI8l4F9a0tMCS/7FFNbSI2GYrKDuLKz6AhK2kxCgUU1ExnTifHVFW91RUI9iEFqF5QUGCW9g7iuXAh45mw4UMA48qWodEoprSmaM8HezDgOHfSxxfkCz60k/IcrsCuAE6Ky53aeRRaV/D9nYc8uisjRyjFNPTZEZrXygdqaYvhqsh4+kFKditEKtAthgSG51l+fqEGvs2pnCwIpk8gD3LIIu/FfTT4AKhJA4SPpUjMajb6K4dXXKCQcWlm6yqSB1FpOJ/r5PJWX2WG8kpn/InovXJAcOeaAps0oCq2irtUCv/oPVzj27yHzBE/yC7R2CafoE6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TnBKeSsySmY2MkZmRUQ0UDNya2ZSRnVvZDJDdm92RTQvdDMwYkR5UExVdGc5?= =?utf-8?B?aVc0dVdIRTk5ZGt1KzlkelR4VHlJRUlFQ1htemVqQVNlbStIdjkrd0cxL3lt?= =?utf-8?B?NWxZZ0hHVUI2bXhPaE1ScEZ6Qm9RQ0tSQ2RiS0ZidlQrdFBlZDFIMysxcFMr?= =?utf-8?B?czBma1lIQWc2Wlg3UUZBQUpGKzlKRUs5YkJxQXJTd3Bxb1JablFKU0dVQkdO?= =?utf-8?B?ZWZTL2tVN2R6aFVlZ1d0anBSdnhpSUJiMk8wa2pJaG5NNXRZSC9NcUJ1Mzds?= =?utf-8?B?N0lyN2ZOcXFBNVI5LzJqZDl5NFB0VEEyVWFJcEVDeCs2bHVFdVlFeTZXTm04?= =?utf-8?B?VnZkVzhxNThxRHRHV09jV0RRUWlidC8yNDN3T09wVXJ3T3lMenRaSGFRM0tM?= =?utf-8?B?Z2dhVzZ2YjlPZ25EQW5IWHlHRFBtc1hYOWVtcXJybWdmYmpTY0hQSGlBZXl6?= =?utf-8?B?Uzl3RGRKWGhZY2dMS0hNWk5vQml1VEZVQktjWVpJbXczMnRhcktsaHBMd1pX?= =?utf-8?B?UElzUkgrZ3ZwQ1JkTFczZ1ZxS2tsL0gyVG9kaXhQUXhscm9FSTk4bW0zZTgv?= =?utf-8?B?K0MwY2E1WXFLa3lCWDlYaUUzeGN1QUVYRUxLTFJOM3NyWkZNSzVWbXdGRjE0?= =?utf-8?B?YnczWjhCL0hCY2lDdmxFTXE4bERpc3p0d0lqV2FWTWxiREZZWDhwZjhRQkxr?= =?utf-8?B?UzVuZHpRemp3VVhxZmdyeDM1eDR6bzZvbjMvZkloaGYwck52U1RBNlFUSk5P?= =?utf-8?B?ZE5DSThXRlphYVlNVm1BWnJkeVpOMllpcW56YmRPK2lVbHNvM2J3YzhUQWRO?= =?utf-8?B?Y2xPUEFlcmNqenFqalVSYnlRVEo4dWpSSVE4ZTh3QWlscFdOczROYzdwVEdQ?= =?utf-8?B?ckF0NVVnYU9zdnA1bHk0TnhWTWhjdDgvNGxHTjJXWVgzZm1CQndjTnBkbVdJ?= =?utf-8?B?OGhiQWE5Nlc4d01BY0xFUVQ0N3ZSR1kyb2IzbVFQTk1pdHNlUEJqRmEwTmpP?= =?utf-8?B?ZGJhalBPNUdCcEtIYWNxRi9MNk5OVUNSNEZCTlpzWS9UNjZMNDBiS1Rhd2lW?= =?utf-8?B?d3pDZy9IT3NjZGpBT0hBRXZFUENPeUJnQnhKWEZtNnhyOW5lWnVmYjRqem51?= =?utf-8?B?UmVjVnVHYmRJRTI5dHhkQWlTVXplelk3bkJUVHpCVDZXNHVRMERXbEFZZVo4?= =?utf-8?B?T01aL0tKckI2R0F5b1pVZER5S0xRYWEzU0VoOGFBTjQ0eDJjS294MGh3QVJ3?= =?utf-8?B?UFlRNVh3aVkwR0NadUs5Nzg5YXo4bGo0L0tvUFd0NlVHVmFqbHpJYTZFMnFT?= =?utf-8?B?NDV2cVJ5RTY1U00ydFdpYWlwNUQ2YUs1V0FOZEYvNExvbm51ZlFEWDNaQ01T?= =?utf-8?B?VHVaMEk5LzFSTXJhN0pIQlZFUVN4Qis5UmRvV1JYNmJpOVNpYmplZTNBemZy?= =?utf-8?B?ZE1SbklYeExwR2Z1aUJ3V0NqMEw0bVVncjhOak0zWDdJOEM3WWM4L2swV0wv?= =?utf-8?B?TW5XRkFpQjBqRUs5WkpOUS9YamVKbDJQdFlYQjdZQXc3a1NFYzFyamJ2Nkls?= =?utf-8?B?QjJJUjIzRXRxc0ttNmdaREVRaFZ1OEx4NUl0VmdoRUNVM0M5NUV1dkhwMGYv?= =?utf-8?B?L3NZUmJQOWM3ZDFhSlZ1NGtsMGViUExMOEoxL1lzWXVXUE5nQWQ2UDE3d1Ns?= =?utf-8?Q?8mPKxOLbkh+pERdmsDgc?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 011f4457-90aa-4c60-dbb3-08db8fca3395 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2023 00:24:41.8792 (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: PR3P250MB0228 Subject: Re: [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 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: Andreas Rheinhardt: > 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" Will apply the last two patches of this patchset (with the small change to use a forward declaration for AVCodecContext in fdctdsp.h to avoid including avcodec.h unnecessarily -- it would incur an unnecessary dependency on avcodec.h for e.g. jfdctfst.c). - Andreas _______________________________________________ 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".