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 E8FDA445BF for ; Sat, 18 Feb 2023 12:50:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C1A3868BDF8; Sat, 18 Feb 2023 14:50:01 +0200 (EET) Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C5F168BBD9 for ; Sat, 18 Feb 2023 14:49:55 +0200 (EET) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id B02471060229 for ; Sat, 18 Feb 2023 12:49:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1676724594; 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=EFH+ERnH4DKk9GyhH2GvNFjm4qApptdethhHFoaTVzQ=; b=3PZhbLDL27GgnhdNhL32Tuiv7Z9tNJqYtlq+lqMXyjFOzxCZEDxXwPEccKq43qbj 5lelXkIIQjSneP6XuVN5FtGOnWGfa/pdk92/QTx1A7CBeJwFCIofOT/qdgNozDAIDnO q2Xdqvr/bR/DHt5aJg0sPlGRn1IPDOO4CGFYegXyU1sGCCKSM6cGNOrd4kZipXq8tVE VgN+GQZ3a2wR3gCNrncuTnJeILCCTbAQWPbb+XEntuaNOFlKRRtswEIfkBy3KZZ2eV6 CQFbmfomtcOmm8nsUTMyqNwhFNwSEQNO/NLL2ua09YgajyFQHWMhwxx0wxpavHSz4D2 gknKHFi6SA== Date: Sat, 18 Feb 2023 13:49:54 +0100 (CET) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: <66307ef3-b214-47f6-6d4e-fbcc439f2004@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_214265_340256089.1676724594708" Subject: Re: [FFmpeg-devel] [PATCH] lavc: deprecate avcodec_dct, av_fft, av_dct, av_rdft and av_mdct 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_214265_340256089.1676724594708 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Feb 17, 2023, 19:45 by dev@lynne.ee: > Feb 17, 2023, 18:08 by jamrial@gmail.com: > >> On 2/17/2023 1:54 PM, Lynne wrote: >> >>> This reverts commit 26cb36f35746fe6ef53688b119852bfa6d555f62. >>> >>> All filters and all codecs (except wmavoice) have been ported for the >>> lavu/tx API. >>> >>> The noise should be minimal. >>> >> >> It isn't. I'm getting more than two thousand lines of warnings after applying this patch from >> >> libavfilter/vf_spp.c >> libavfilter/x86/vf_spp.c >> libavcodec/asvenc.c >> libavcodec/avdct.c >> libavcodec/avfft.c >> libavcodec/dct.c >> libavcodec/fdctdsp.c >> libavcodec/fft_float.c >> libavcodec/fft_init_table.c >> libavcodec/idctdsp.c >> libavcodec/jfdctfst.c >> libavcodec/jfdctint.c >> libavcodec/jrevdct.c >> libavcodec/mpegaudiodsp.c >> libavcodec/mpegvideo_enc.c >> libavcodec/rdft.c >> libavcodec/wmavoice.c >> libavcodec/x86/dct_init.c >> libavcodec/x86/fft_init.c >> libavcodec/x86/mpegvideoenc.c >> >> It's not just wmavoice, there's also mpeg and jpeg stuff, and one filter. For the actual fft/dct/rdft/mdct source files, you should use the deprecation warning pragmas to silence them, but the other modules need to be ported. >> This patch is also missing the schedule FF_API deprecation wrapper. >> > > Is the noise acceptable if I just deprecate the functions? > It wasn't before, but it should be much less now. > Version 2 attached. Deprecates only the init functions (which must always be used, therefore the entire API is deprecated). Included FF_API defines, and bumped minor. ------=_Part_214265_340256089.1676724594708 Content-Type: text/x-diff; charset=us-ascii; name=v2-0001-PATCH-lavc-deprecate-avcodec_dct-av_fft-av_dct-av.patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=v2-0001-PATCH-lavc-deprecate-avcodec_dct-av_fft-av_dct-av.patch >From 3d6e89ba864622855468ea1874511acaf094ef97 Mon Sep 17 00:00:00 2001 From: Lynne Date: Sat, 18 Feb 2023 13:43:39 +0100 Subject: [PATCH v2] [PATCH] lavc: deprecate avcodec_dct, av_fft, av_dct, av_rdft and av_mdct This effectively reverts commit 26cb36f35746fe6ef53688b119852bfa6d555f62. --- doc/APIchanges | 4 ++++ libavcodec/avdct.h | 6 ++++++ libavcodec/avfft.h | 9 +++++++++ libavcodec/version.h | 2 +- libavcodec/version_major.h | 2 ++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 29161e30bf..7e3e3767d2 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-02-17 - xxxxxxxxxx - lavc 60.3.100 - avdct.h avfft.h + Deprecate avcodec_dct, av_dct, av_rdft, av_fft and av_mdct. + Replaced by libavutil/tx.h + 2023-02-16 - xxxxxxxxxx - lavf 60.2.100 - avformat.h Deprecate AVFormatContext io_close callback. The superior io_close2 callback should be used instead. diff --git a/libavcodec/avdct.h b/libavcodec/avdct.h index 6411fab6f6..582019f646 100644 --- a/libavcodec/avdct.h +++ b/libavcodec/avdct.h @@ -19,6 +19,10 @@ #ifndef AVCODEC_AVDCT_H #define AVCODEC_AVDCT_H +#include "libavutil/attributes.h" +#include "version_major.h" +#if FF_API_AVDCT + #include "libavutil/opt.h" /** @@ -80,9 +84,11 @@ typedef struct AVDCT { * * To free it use av_free() */ +attribute_deprecated AVDCT *avcodec_dct_alloc(void); int avcodec_dct_init(AVDCT *); const AVClass *avcodec_dct_get_class(void); +#endif /* FF_API_AVDCT */ #endif /* AVCODEC_AVDCT_H */ diff --git a/libavcodec/avfft.h b/libavcodec/avfft.h index 0c0f9b8d8d..a1548ff474 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 @@ -45,6 +49,7 @@ typedef struct FFTContext FFTContext; * @param nbits log2 of the length of the input array * @param inverse if 0 perform the forward transform, if 1 perform the inverse */ +attribute_deprecated FFTContext *av_fft_init(int nbits, int inverse); /** @@ -60,6 +65,7 @@ void av_fft_calc(FFTContext *s, FFTComplex *z); void av_fft_end(FFTContext *s); +attribute_deprecated FFTContext *av_mdct_init(int nbits, int inverse, double scale); void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input); @@ -82,6 +88,7 @@ typedef struct RDFTContext RDFTContext; * @param nbits log2 of the length of the input array * @param trans the type of transform */ +attribute_deprecated RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans); void av_rdft_calc(RDFTContext *s, FFTSample *data); void av_rdft_end(RDFTContext *s); @@ -107,6 +114,7 @@ enum DCTTransformType { * * @note the first element of the input of DST-I is ignored */ +attribute_deprecated DCTContext *av_dct_init(int nbits, enum DCTTransformType type); void av_dct_calc(DCTContext *s, FFTSample *data); void av_dct_end (DCTContext *s); @@ -115,4 +123,5 @@ void av_dct_end (DCTContext *s); * @} */ +#endif /* FF_API_AVFFT */ #endif /* AVCODEC_AVFFT_H */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 0550d7b0d8..43794ea588 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 2 +#define LIBAVCODEC_VERSION_MINOR 3 #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 c2f118b262..59cbc15537 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -45,6 +45,8 @@ #define FF_API_AVCODEC_CHROMA_POS (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_VT_HWACCEL_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_AVCTX_FRAME_NUMBER (LIBAVCODEC_VERSION_MAJOR < 61) +#define FF_API_AVFFT (LIBAVCODEC_VERSION_MAJOR < 61) +#define FF_API_AVDCT (LIBAVCODEC_VERSION_MAJOR < 61) // reminder to remove CrystalHD decoders on next major bump #define FF_CODEC_CRYSTAL_HD (LIBAVCODEC_VERSION_MAJOR < 61) -- 2.39.2 ------=_Part_214265_340256089.1676724594708 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_214265_340256089.1676724594708--