From 24af1aa0f70362a66cda04c9d7cd012e019f5572 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 18 Feb 2014 11:52:42 +0100
Subject: [PATCH] fft: Convert FFT/MDCT permutation type #defines to enums
---
libavcodec/fft.h | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/libavcodec/fft.h b/libavcodec/fft.h
index 130bbca219e..7daae24ca30 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
--
GitLab