Commit 24af1aa0 authored by Diego Biurrun's avatar Diego Biurrun

fft: Convert FFT/MDCT permutation type #defines to enums

parent 746ad4e0
...@@ -59,6 +59,17 @@ typedef struct FFTDComplex { ...@@ -59,6 +59,17 @@ typedef struct FFTDComplex {
/* FFT computation */ /* 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 { struct FFTContext {
int nbits; int nbits;
int inverse; int inverse;
...@@ -82,13 +93,8 @@ struct FFTContext { ...@@ -82,13 +93,8 @@ struct FFTContext {
void (*imdct_half)(struct FFTContext *s, FFTSample *output, const FFTSample *input); void (*imdct_half)(struct FFTContext *s, FFTSample *output, const FFTSample *input);
void (*mdct_calc)(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); void (*mdct_calcw)(struct FFTContext *s, FFTDouble *output, const FFTSample *input);
int fft_permutation; enum fft_permutation_type fft_permutation;
#define FF_FFT_PERM_DEFAULT 0 enum mdct_permutation_type mdct_permutation;
#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
}; };
#if CONFIG_HARDCODED_TABLES #if CONFIG_HARDCODED_TABLES
......
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