Commit 26cb36f3 authored by James Almer's avatar James Almer

Revert "lavc: deprecate avcodec_dct, av_fft, av_dct, av_rdft and av_mdct"

There are sill many users of these APIs within libav*, so this commit
introduced too many deprecation warnings, making compilation too noisy and
potentially hiding legit warnings.
Once the remaining users are ported, this can be reapplied.

This reverts commit 76d00385.
parent 76d00385
...@@ -14,10 +14,6 @@ libavutil: 2021-04-27 ...@@ -14,10 +14,6 @@ libavutil: 2021-04-27
API changes, most recent first: API changes, most recent first:
2022-11-06 - xxxxxxxxxx - lavc 59.52.100 - avdct.h avfft.h
Deprecate avcodec_dct, av_dct, av_rdft, av_fft and av_mdct.
Replaced by libavutil/tx.h
2022-xx-xx - xxxxxxxxxx - lavu 57.42.100 - dict.h 2022-xx-xx - xxxxxxxxxx - lavu 57.42.100 - dict.h
Add av_dict_iterate(). Add av_dict_iterate().
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#ifndef AVCODEC_AVDCT_H #ifndef AVCODEC_AVDCT_H
#define AVCODEC_AVDCT_H #define AVCODEC_AVDCT_H
#include "libavutil/attributes.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
/** /**
...@@ -27,7 +26,7 @@ ...@@ -27,7 +26,7 @@
* @note function pointers can be NULL if the specific features have been * @note function pointers can be NULL if the specific features have been
* disabled at build time. * disabled at build time.
*/ */
typedef struct attribute_deprecated AVDCT { typedef struct AVDCT {
const AVClass *av_class; const AVClass *av_class;
void (*idct)(int16_t *block /* align 16 */); void (*idct)(int16_t *block /* align 16 */);
...@@ -81,13 +80,9 @@ typedef struct attribute_deprecated AVDCT { ...@@ -81,13 +80,9 @@ typedef struct attribute_deprecated AVDCT {
* *
* To free it use av_free() * To free it use av_free()
*/ */
attribute_deprecated
AVDCT *avcodec_dct_alloc(void); AVDCT *avcodec_dct_alloc(void);
attribute_deprecated
int avcodec_dct_init(AVDCT *); int avcodec_dct_init(AVDCT *);
attribute_deprecated
const AVClass *avcodec_dct_get_class(void); const AVClass *avcodec_dct_get_class(void);
#endif /* AVCODEC_AVDCT_H */ #endif /* AVCODEC_AVDCT_H */
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
#ifndef AVCODEC_AVFFT_H #ifndef AVCODEC_AVFFT_H
#define AVCODEC_AVFFT_H #define AVCODEC_AVFFT_H
#include "libavutil/attributes.h"
/** /**
* @file * @file
* @ingroup lavc_fft * @ingroup lavc_fft
...@@ -34,83 +32,65 @@ ...@@ -34,83 +32,65 @@
* @{ * @{
*/ */
typedef float attribute_deprecated FFTSample; typedef float FFTSample;
typedef struct attribute_deprecated FFTComplex { typedef struct FFTComplex {
FFTSample re, im; FFTSample re, im;
} FFTComplex; } FFTComplex;
typedef struct attribute_deprecated FFTContext FFTContext; typedef struct FFTContext FFTContext;
/** /**
* Set up a complex FFT. * Set up a complex FFT.
* @param nbits log2 of the length of the input array * @param nbits log2 of the length of the input array
* @param inverse if 0 perform the forward transform, if 1 perform the inverse * @param inverse if 0 perform the forward transform, if 1 perform the inverse
*/ */
attribute_deprecated
FFTContext *av_fft_init(int nbits, int inverse); FFTContext *av_fft_init(int nbits, int inverse);
/** /**
* Do the permutation needed BEFORE calling ff_fft_calc(). * Do the permutation needed BEFORE calling ff_fft_calc().
*/ */
attribute_deprecated
void av_fft_permute(FFTContext *s, FFTComplex *z); void av_fft_permute(FFTContext *s, FFTComplex *z);
/** /**
* Do a complex FFT with the parameters defined in av_fft_init(). The * 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. * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
*/ */
attribute_deprecated
void av_fft_calc(FFTContext *s, FFTComplex *z); void av_fft_calc(FFTContext *s, FFTComplex *z);
attribute_deprecated
void av_fft_end(FFTContext *s); void av_fft_end(FFTContext *s);
attribute_deprecated
FFTContext *av_mdct_init(int nbits, int inverse, double scale); FFTContext *av_mdct_init(int nbits, int inverse, double scale);
attribute_deprecated
void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
attribute_deprecated
void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input); void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input);
attribute_deprecated
void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
attribute_deprecated
void av_mdct_end(FFTContext *s); void av_mdct_end(FFTContext *s);
/* Real Discrete Fourier Transform */ /* Real Discrete Fourier Transform */
enum attribute_deprecated RDFTransformType { enum RDFTransformType {
DFT_R2C, DFT_R2C,
IDFT_C2R, IDFT_C2R,
IDFT_R2C, IDFT_R2C,
DFT_C2R, DFT_C2R,
}; };
typedef struct attribute_deprecated RDFTContext RDFTContext; typedef struct RDFTContext RDFTContext;
/** /**
* Set up a real FFT. * Set up a real FFT.
* @param nbits log2 of the length of the input array * @param nbits log2 of the length of the input array
* @param trans the type of transform * @param trans the type of transform
*/ */
attribute_deprecated
RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans); RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans);
attribute_deprecated
void av_rdft_calc(RDFTContext *s, FFTSample *data); void av_rdft_calc(RDFTContext *s, FFTSample *data);
attribute_deprecated
void av_rdft_end(RDFTContext *s); void av_rdft_end(RDFTContext *s);
/* Discrete Cosine Transform */ /* Discrete Cosine Transform */
typedef struct attribute_deprecated DCTContext DCTContext; typedef struct DCTContext DCTContext;
enum attribute_deprecated DCTTransformType { enum DCTTransformType {
DCT_II = 0, DCT_II = 0,
DCT_III, DCT_III,
DCT_I, DCT_I,
...@@ -127,13 +107,8 @@ enum attribute_deprecated DCTTransformType { ...@@ -127,13 +107,8 @@ enum attribute_deprecated DCTTransformType {
* *
* @note the first element of the input of DST-I is ignored * @note the first element of the input of DST-I is ignored
*/ */
attribute_deprecated
DCTContext *av_dct_init(int nbits, enum DCTTransformType type); DCTContext *av_dct_init(int nbits, enum DCTTransformType type);
attribute_deprecated
void av_dct_calc(DCTContext *s, FFTSample *data); void av_dct_calc(DCTContext *s, FFTSample *data);
attribute_deprecated
void av_dct_end (DCTContext *s); void av_dct_end (DCTContext *s);
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment