diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-18 11:52:42 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-07-18 07:29:13 -0700 |
| commit | 24af1aa0f70362a66cda04c9d7cd012e019f5572 (patch) | |
| tree | 7101b7a06c7c02270ef741271122a25d8fbf9a22 | |
| parent | 746ad4e0df7faf93329804e412ec53c1d929a75b (diff) | |
| download | ffmpeg-24af1aa0f70362a66cda04c9d7cd012e019f5572.tar.gz | |
fft: Convert FFT/MDCT permutation type #defines to enums
| -rw-r--r-- | libavcodec/fft.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/libavcodec/fft.h b/libavcodec/fft.h index 130bbca219..7daae24ca3 100644 --- a/libavcodec/fft.h +++ b/libavcodec/fft.h @@ -59,6 +59,17 @@ typedef struct FFTDComplex { /* FFT computation */ +enum fft_permutation_type { + FF_FFT_PERM_DEFAULT, + FF_FFT_PERM_SWAP_LSBS, + FF_FFT_PERM_AVX, +}; + +enum mdct_permutation_type { + FF_MDCT_PERM_NONE, + FF_MDCT_PERM_INTERLEAVE, +}; + struct FFTContext { int nbits; int inverse; @@ -82,13 +93,8 @@ struct FFTContext { void (*imdct_half)(struct FFTContext *s, FFTSample *output, const FFTSample *input); void (*mdct_calc)(struct FFTContext *s, FFTSample *output, const FFTSample *input); void (*mdct_calcw)(struct FFTContext *s, FFTDouble *output, const FFTSample *input); - int fft_permutation; -#define FF_FFT_PERM_DEFAULT 0 -#define FF_FFT_PERM_SWAP_LSBS 1 -#define FF_FFT_PERM_AVX 2 - int mdct_permutation; -#define FF_MDCT_PERM_NONE 0 -#define FF_MDCT_PERM_INTERLEAVE 1 + enum fft_permutation_type fft_permutation; + enum mdct_permutation_type mdct_permutation; }; #if CONFIG_HARDCODED_TABLES |