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 A7AC746FD7 for ; Mon, 24 Jul 2023 22:47:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85AF768C7F4; Tue, 25 Jul 2023 01:47:18 +0300 (EEST) Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A569768C7BA for ; Tue, 25 Jul 2023 01:47:12 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id E915D106015D for ; Mon, 24 Jul 2023 22:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1690238832; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:References:Sender; bh=r/fmD7lxRIwq2rnVDTrw0A4ViHy7vgu+OMHjjkO6U+w=; b=4LKpfobDkwc/MXHrjrt6jiVCyd668yEVFgcWG1VpvF9G289u+7/F6JNWdGWoqL3I nY/ujcGMPuzT4vSB4dUIQQ0zkPkAAatR/XB+7oobnK+3FQ5x+VDEDXq8yi+W8hFDl8T IvqPAR2uK1NjXCPNpuZesPaET5bC8JZCrzKWfd7ZPiW1KTjfoS1ZpB2GmDqTEb5mrpq WmsDgp8A8GS6dwEMkt1IQrmzw7hKNublM9e3GvyzroOd4/2EVxTzkRpu/zq15lSo8pr SfXI5HP0Ift2WG2uy6OmK89cI5r9GszK1t83DJH6kbUBbsbYJjB2TKesf3jmIL10b+k XrxpPMqlZA== Date: Tue, 25 Jul 2023 00:47:12 +0200 (CEST) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_491093_1085738362.1690238832083" Subject: Re: [FFmpeg-devel] [PATCH 2/2] lavc/avfft: deprecate the API 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: ------=_Part_491093_1085738362.1690238832083 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Jul 25, 2023, 00:19 by andreas.rheinhardt@outlook.com: > Lynne: > >> Subject: [PATCH 2/2] lavc/avfft: deprecate the API >> >> This deprecates the currently unused API. >> > ^ > superseded > >> --- >> doc/APIchanges | 4 ++++ >> libavcodec/avfft.h | 25 +++++++++++++++++++++++++ >> libavcodec/tests/fft.c | 4 ++++ >> libavcodec/version.h | 2 +- >> libavcodec/version_major.h | 2 ++ >> 5 files changed, 36 insertions(+), 1 deletion(-) >> >> diff --git a/doc/APIchanges b/doc/APIchanges >> index 5afe8bcb75..38fc0b1459 100644 >> --- a/doc/APIchanges >> +++ b/doc/APIchanges >> @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2023-02-09 >> >> API changes, most recent first: >> >> +2023-07-xx - xxxxxxxxxx - lavc 60.23.100 - avfft.h >> + Deprecate av_dct, av_rdft, av_fft and av_mdct. >> > > This should mention that the whole header is deprecated and will be removed. > >> + Replaced by libavutil/tx.h >> + >> 2023-07-xx - xxxxxxxxxx - lavc 60 - avcodec.h >> Deprecate AV_CODEC_FLAG_DROPCHANGED without replacement. >> >> diff --git a/libavcodec/avfft.h b/libavcodec/avfft.h >> index 0c0f9b8d8d..6401833089 100644 >> --- a/libavcodec/avfft.h >> +++ b/libavcodec/avfft.h >> @@ -19,6 +19,10 @@ >> #ifndef AVCODEC_AVFFT_H >> #define AVCODEC_AVFFT_H >> >> +#include "libavutil/attributes.h" >> +#include "version_major.h" >> +#if FF_API_AVFFT >> + >> /** >> * @file >> * @ingroup lavc_fft >> @@ -44,26 +48,38 @@ typedef struct FFTContext FFTContext; >> * Set up a complex FFT. >> * @param nbits log2 of the length of the input array >> * @param inverse if 0 perform the forward transform, if 1 perform the inverse >> + * @deprecated use AVTXContext from libavutil/tx.h >> */ >> +attribute_deprecated >> FFTContext *av_fft_init(int nbits, int inverse); >> >> /** >> * Do the permutation needed BEFORE calling ff_fft_calc(). >> + * @deprecated use AVTXContext from libavutil/tx.h >> */ >> +attribute_deprecated >> void av_fft_permute(FFTContext *s, FFTComplex *z); >> >> /** >> * Do a complex FFT with the parameters defined in av_fft_init(). The >> * input data must be permuted before. No 1.0/sqrt(n) normalization is done. >> + * @deprecated use AVTXContext from libavutil/tx.h >> > > This deprecation warning is supposed to apply to av_fft_calc() and > apparently AVTXContext is not a replacement for av_fft_calc(). Probably > better to write something like: "Use the AVTX API from libavutil/tx.h." > v2 attached. Added a comment to both APIchanges on a replacement, and added comments to this file to indicate how to replace each functionality. >> >> -#define LIBAVCODEC_VERSION_MINOR 22 >> +#define LIBAVCODEC_VERSION_MINOR 23 >> #define LIBAVCODEC_VERSION_MICRO 100 >> >> #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ >> diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h >> index 95c5aec0c5..cfd0b5023e 100644 >> --- a/libavcodec/version_major.h >> +++ b/libavcodec/version_major.h >> @@ -50,6 +50,8 @@ >> #define FF_API_TICKS_PER_FRAME (LIBAVCODEC_VERSION_MAJOR < 61) >> #define FF_API_DROPCHANGED (LIBAVCODEC_VERSION_MAJOR < 61) >> >> +#define FF_API_AVFFT (LIBAVCODEC_VERSION_MAJOR < 62) >> + >> // reminder to remove CrystalHD decoders on next major bump >> #define FF_CODEC_CRYSTAL_HD (LIBAVCODEC_VERSION_MAJOR < 61) >> > > This patch is very much orthogonal to my patch (as expected). > This patch is - but my next series of patches will enable full removal of all FFT code from lavc - which I would prefer to do all at once, if possible. ------=_Part_491093_1085738362.1690238832083 Content-Type: text/x-diff; charset=us-ascii; name=v2-0002-lavc-avfft-deprecate-the-API.patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=v2-0002-lavc-avfft-deprecate-the-API.patch >From fc7891b0cfeb296525919d1ff8baaa2c0b68bbeb Mon Sep 17 00:00:00 2001 From: Lynne Date: Mon, 24 Jul 2023 23:55:55 +0200 Subject: [PATCH v2 2/2] lavc/avfft: deprecate the API This deprecates the currently unused API. --- doc/APIchanges | 5 +++++ libavcodec/avfft.h | 31 +++++++++++++++++++++++++++++++ libavcodec/tests/fft.c | 4 ++++ libavcodec/version.h | 2 +- libavcodec/version_major.h | 2 ++ 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 5afe8bcb75..6f6c3b4aa6 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,11 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-07-xx - xxxxxxxxxx - lavc 60.23.100 - avfft.h + The entire header will be deprecated and removed in two major bumps. + For a replacement to av_dct, av_rdft, av_fft and av_mdct, use + the new API from libavutil/tx.h. + 2023-07-xx - xxxxxxxxxx - lavc 60 - avcodec.h Deprecate AV_CODEC_FLAG_DROPCHANGED without replacement. diff --git a/libavcodec/avfft.h b/libavcodec/avfft.h index 0c0f9b8d8d..e3a0da1eb9 100644 --- a/libavcodec/avfft.h +++ b/libavcodec/avfft.h @@ -19,6 +19,10 @@ #ifndef AVCODEC_AVFFT_H #define AVCODEC_AVFFT_H +#include "libavutil/attributes.h" +#include "version_major.h" +#if FF_API_AVFFT + /** * @file * @ingroup lavc_fft @@ -44,26 +48,42 @@ typedef struct FFTContext FFTContext; * Set up a complex FFT. * @param nbits log2 of the length of the input array * @param inverse if 0 perform the forward transform, if 1 perform the inverse + * @deprecated use av_tx_init from libavutil/tx.h with a type of AV_TX_FLOAT_FFT */ +attribute_deprecated FFTContext *av_fft_init(int nbits, int inverse); /** * Do the permutation needed BEFORE calling ff_fft_calc(). + * @deprecated without replacement */ +attribute_deprecated void av_fft_permute(FFTContext *s, FFTComplex *z); /** * Do a complex FFT with the parameters defined in av_fft_init(). The * input data must be permuted before. No 1.0/sqrt(n) normalization is done. + * @deprecated use the av_tx_fn value returned by av_tx_init, which also does permutation */ +attribute_deprecated void av_fft_calc(FFTContext *s, FFTComplex *z); +attribute_deprecated void av_fft_end(FFTContext *s); +/** + * @deprecated use av_tx_init from libavutil/tx.h with a type of AV_TX_FLOAT_MDCT, + * with a flag of AV_TX_FULL_IMDCT for a replacement to av_imdct_calc. + */ +attribute_deprecated FFTContext *av_mdct_init(int nbits, int inverse, double scale); +attribute_deprecated void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); +attribute_deprecated void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input); +attribute_deprecated void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); +attribute_deprecated void av_mdct_end(FFTContext *s); /* Real Discrete Fourier Transform */ @@ -81,9 +101,14 @@ typedef struct RDFTContext RDFTContext; * Set up a real FFT. * @param nbits log2 of the length of the input array * @param trans the type of transform + * + * @deprecated use av_tx_init from libavutil/tx.h with a type of AV_TX_FLOAT_RDFT */ +attribute_deprecated RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans); +attribute_deprecated void av_rdft_calc(RDFTContext *s, FFTSample *data); +attribute_deprecated void av_rdft_end(RDFTContext *s); /* Discrete Cosine Transform */ @@ -106,13 +131,19 @@ enum DCTTransformType { * @param type the type of transform * * @note the first element of the input of DST-I is ignored + * + * @deprecated use av_tx_init from libavutil/tx.h with an appropriate type of AV_TX_FLOAT_DCT */ +attribute_deprecated DCTContext *av_dct_init(int nbits, enum DCTTransformType type); +attribute_deprecated void av_dct_calc(DCTContext *s, FFTSample *data); +attribute_deprecated void av_dct_end (DCTContext *s); /** * @} */ +#endif /* FF_API_AVFFT */ #endif /* AVCODEC_AVFFT_H */ diff --git a/libavcodec/tests/fft.c b/libavcodec/tests/fft.c index 163f3e89c4..a9ea457bc9 100644 --- a/libavcodec/tests/fft.c +++ b/libavcodec/tests/fft.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +FF_DISABLE_DEPRECATION_WARNINGS + /** * @file * FFT and MDCT tests. @@ -675,3 +677,5 @@ cleanup: return !!err; } + +FF_ENABLE_DEPRECATION_WARNINGS diff --git a/libavcodec/version.h b/libavcodec/version.h index 9411511e04..728ab8839d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 22 +#define LIBAVCODEC_VERSION_MINOR 23 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 95c5aec0c5..cfd0b5023e 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -50,6 +50,8 @@ #define FF_API_TICKS_PER_FRAME (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_DROPCHANGED (LIBAVCODEC_VERSION_MAJOR < 61) +#define FF_API_AVFFT (LIBAVCODEC_VERSION_MAJOR < 62) + // reminder to remove CrystalHD decoders on next major bump #define FF_CODEC_CRYSTAL_HD (LIBAVCODEC_VERSION_MAJOR < 61) -- 2.40.1 ------=_Part_491093_1085738362.1690238832083 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". ------=_Part_491093_1085738362.1690238832083--