rename CONFIG_FFT_FIXED_32 -> FFT_FIXED_32

This matches FFT_FLOAT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/fft-fixed32-test.c b/libavcodec/fft-fixed32-test.c
index 664d2af..4bd11ce 100644 (file)
--- a/libavcodec/fft-fixed32-test.c
+++ b/libavcodec/fft-fixed32-test.c
@@ -17,5 +17,5 @@
  */
 
 #define FFT_FLOAT 0
-#define CONFIG_FFT_FIXED_32 1
+#define FFT_FIXED_32 1
 #include "fft-test.c"

diff --git a/libavcodec/fft-internal.h b/libavcodec/fft-internal.h
index afc17db..0a8f7d0 100644 (file)
--- a/libavcodec/fft-internal.h
+++ b/libavcodec/fft-internal.h
@@ -38,7 +38,7 @@
 
 #define SCALE_FLOAT(a, bits) lrint((a) * (double)(1 << (bits)))
 
-#if CONFIG_FFT_FIXED_32
+#if FFT_FIXED_32
 
 #define CMUL(dre, dim, are, aim, bre, bim) do {             \
         int64_t accu;                                     \
@@ -52,7 +52,7 @@
 
 #define FIX15(a) av_clip(SCALE_FLOAT(a, 31), -2147483647, 2147483647)
 
-#else /* CONFIG_FFT_FIXED_32 */
+#else /* FFT_FIXED_32 */
 
 #include "fft.h"
 #include "mathops.h"
@@ -79,7 +79,7 @@ void ff_mdct_calcw_c(FFTContext *s, FFTDouble *output, const FFTSample *input);
 #define CMULL(dre, dim, are, aim, bre, bim)     \
     CMULS(dre, dim, are, aim, bre, bim, 0)
 
-#endif /* CONFIG_FFT_FIXED_32 */
+#endif /* FFT_FIXED_32 */
 
 #endif /* FFT_FLOAT */
 

diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c
index 5819cc0..ef1d622 100644 (file)
--- a/libavcodec/fft-test.c
+++ b/libavcodec/fft-test.c
@@ -55,7 +55,7 @@
 #   define RANGE 1.0
 #   define REF_SCALE(x, bits)  (x)
 #   define FMT "%10.6f"
-#elif CONFIG_FFT_FIXED_32
+#elif FFT_FIXED_32
 #   define RANGE 8388608
 #   define REF_SCALE(x, bits) (x)
 #   define FMT "%6d"

diff --git a/libavcodec/fft.h b/libavcodec/fft.h
index 87fe704..1c48145 100644 (file)
--- a/libavcodec/fft.h
+++ b/libavcodec/fft.h
@@ -26,8 +26,8 @@
 #define FFT_FLOAT 1
 #endif
 
-#ifndef CONFIG_FFT_FIXED_32
-#define CONFIG_FFT_FIXED_32 0
+#ifndef FFT_FIXED_32
+#define FFT_FIXED_32 0
 #endif
 
 #include <stdint.h>
@@ -44,20 +44,20 @@ typedef float FFTDouble;
 
 #else
 
-#if CONFIG_FFT_FIXED_32
+#if FFT_FIXED_32
 
 #define Q31(x) (int)((x)*2147483648.0 + 0.5)
 #define FFT_NAME(x) x ## _fixed_32
 
 typedef int32_t FFTSample;
 
-#else /* CONFIG_FFT_FIXED_32 */
+#else /* FFT_FIXED_32 */
 
 #define FFT_NAME(x) x ## _fixed
 
 typedef int16_t FFTSample;
 
-#endif /* CONFIG_FFT_FIXED_32 */
+#endif /* FFT_FIXED_32 */
 
 typedef struct FFTComplex {
     FFTSample re, im;

diff --git a/libavcodec/fft_fixed.c b/libavcodec/fft_fixed.c
index d93351b..3d3bd2f 100644 (file)
--- a/libavcodec/fft_fixed.c
+++ b/libavcodec/fft_fixed.c
@@ -17,5 +17,5 @@
  */
 
 #define FFT_FLOAT 0
-#define CONFIG_FFT_FIXED_32 0
+#define FFT_FIXED_32 0
 #include "fft_template.c"

diff --git a/libavcodec/fft_fixed_32.c b/libavcodec/fft_fixed_32.c
index dbab316..fbdbf84 100644 (file)
--- a/libavcodec/fft_fixed_32.c
+++ b/libavcodec/fft_fixed_32.c
@@ -48,5 +48,5 @@
  */
 
 #define FFT_FLOAT 0
-#define CONFIG_FFT_FIXED_32 1
+#define FFT_FIXED_32 1
 #include "fft_template.c"

diff --git a/libavcodec/fft_float.c b/libavcodec/fft_float.c
index 5d5cb6f..73cc98d 100644 (file)
--- a/libavcodec/fft_float.c
+++ b/libavcodec/fft_float.c
@@ -17,5 +17,5 @@
  */
 
 #define FFT_FLOAT 1
-#define CONFIG_FFT_FIXED_32 0
+#define FFT_FIXED_32 0
 #include "fft_template.c"

diff --git a/libavcodec/fft_template.c b/libavcodec/fft_template.c
index e6a87ae..97224fe 100644 (file)
--- a/libavcodec/fft_template.c
+++ b/libavcodec/fft_template.c
@@ -32,9 +32,9 @@
 #include "fft.h"
 #include "fft-internal.h"
 
-#if CONFIG_FFT_FIXED_32
+#if FFT_FIXED_32
 #include "fft_table.h"
-#else /* CONFIG_FFT_FIXED_32 */
+#else /* FFT_FIXED_32 */
 
 /* cos(2*pi*x/n) for 0<=x<=n/4, followed by its reverse */
 #if !CONFIG_HARDCODED_TABLES
@@ -69,7 +69,7 @@ COSTABLE_CONST FFTSample * const FFT_NAME(ff_cos_tabs)[] = {
     FFT_NAME(ff_cos_65536),
 };
 
-#endif /* CONFIG_FFT_FIXED_32 */
+#endif /* FFT_FIXED_32 */
 
 static void fft_permute_c(FFTContext *s, FFTComplex *z);
 static void fft_calc_c(FFTContext *s, FFTComplex *z);
@@ -87,7 +87,7 @@ static int split_radix_permutation(int i, int n, int inverse)
 
 av_cold void ff_init_ff_cos_tabs(int index)
 {
-#if (!CONFIG_HARDCODED_TABLES) && (!CONFIG_FFT_FIXED_32)
+#if (!CONFIG_HARDCODED_TABLES) && (!FFT_FIXED_32)
     int i;
     int m = 1<<index;
     double freq = 2*M_PI/m;
@@ -163,12 +163,12 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse)
     s->mdct_calc   = ff_mdct_calc_c;
 #endif
 
-#if CONFIG_FFT_FIXED_32
+#if FFT_FIXED_32
     {
         int n=0;
         ff_fft_lut_init(fft_offsets_lut, 0, 1 << 16, &n);
     }
-#else /* CONFIG_FFT_FIXED_32 */
+#else /* FFT_FIXED_32 */
 #if FFT_FLOAT
     if (ARCH_ARM)     ff_fft_init_arm(s);
     if (ARCH_PPC)     ff_fft_init_ppc(s);
@@ -182,7 +182,7 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse)
     for(j=4; j<=nbits; j++) {
         ff_init_ff_cos_tabs(j);
     }
-#endif /* CONFIG_FFT_FIXED_32 */
+#endif /* FFT_FIXED_32 */
 
 
     if (s->fft_permutation == FF_FFT_PERM_AVX) {
@@ -219,7 +219,7 @@ av_cold void ff_fft_end(FFTContext *s)
     av_freep(&s->tmp_buf);
 }
 
-#if CONFIG_FFT_FIXED_32
+#if FFT_FIXED_32
 
 static void fft_calc_c(FFTContext *s, FFTComplex *z) {
 
@@ -380,7 +380,7 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) {
     }
 }
 
-#else /* CONFIG_FFT_FIXED_32 */
+#else /* FFT_FIXED_32 */
 
 #define BUTTERFLIES(a0,a1,a2,a3) {\
     BF(t3, t5, t5, t1);\
@@ -527,4 +527,4 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z)
 {
     fft_dispatch[s->nbits-2](z);
 }
-#endif /* CONFIG_FFT_FIXED_32 */
+#endif /* FFT_FIXED_32 */

diff --git a/libavcodec/mdct_fixed.c b/libavcodec/mdct_fixed.c
index bdace25..a32cb00 100644 (file)
--- a/libavcodec/mdct_fixed.c
+++ b/libavcodec/mdct_fixed.c
@@ -17,7 +17,7 @@
  */
 
 #define FFT_FLOAT 0
-#define CONFIG_FFT_FIXED_32 0
+#define FFT_FIXED_32 0
 #include "mdct_template.c"
 
 /* same as ff_mdct_calcw_c with double-width unscaled output */

diff --git a/libavcodec/mdct_fixed_32.c b/libavcodec/mdct_fixed_32.c
index 188b57f..5a34dfe 100644 (file)
--- a/libavcodec/mdct_fixed_32.c
+++ b/libavcodec/mdct_fixed_32.c
@@ -48,5 +48,5 @@
  */
 
 #define FFT_FLOAT 0
-#define CONFIG_FFT_FIXED_32 1
+#define FFT_FIXED_32 1
 #include "mdct_template.c"

diff --git a/libavcodec/mdct_float.c b/libavcodec/mdct_float.c
index 68580ba..cff2d21 100644 (file)
--- a/libavcodec/mdct_float.c
+++ b/libavcodec/mdct_float.c
@@ -17,5 +17,5 @@
  */
 
 #define FFT_FLOAT 1
-#define CONFIG_FFT_FIXED_32 0
+#define FFT_FIXED_32 0
 #include "mdct_template.c"

diff --git a/libavcodec/mdct_template.c b/libavcodec/mdct_template.c
index dc74168..a66ac4c 100644 (file)
--- a/libavcodec/mdct_template.c
+++ b/libavcodec/mdct_template.c
@@ -34,11 +34,11 @@
 #if FFT_FLOAT
 #   define RSCALE(x) (x)
 #else
-#if CONFIG_FFT_FIXED_32
+#if FFT_FIXED_32
 #   define RSCALE(x) (((x) + 32) >> 6)
-#else /* CONFIG_FFT_FIXED_32 */
+#else /* FFT_FIXED_32 */
 #   define RSCALE(x) ((x) >> 1)
-#endif /* CONFIG_FFT_FIXED_32 */
+#endif /* FFT_FIXED_32 */
 #endif
 
 /**