Browse code
Rename CONFIG_FFT_FLOAT ---> FFT_FLOAT
The define does not originate from configure, so it should not
have a name that is CONFIG_-prefixed.
Diego Biurrun authored on 2014/01/06 22:48:18Showing 13 changed files
- libavcodec/ac3enc_fixed.c
- libavcodec/arm/fft_fixed_init_arm.c
- libavcodec/cos_tablegen.c
- libavcodec/fft-fixed-test.c
- libavcodec/fft-internal.h
- libavcodec/fft-test.c
- libavcodec/fft.h
- libavcodec/fft_fixed.c
- libavcodec/fft_float.c
- libavcodec/fft_template.c
- libavcodec/mdct_fixed.c
- libavcodec/mdct_float.c
- libavcodec/mdct_template.c
| ... | ... |
@@ -57,7 +57,7 @@ int main(int argc, char *argv[]) |
| 57 | 57 |
double (*func)(double) = do_sin ? sin : cos; |
| 58 | 58 |
|
| 59 | 59 |
printf("/* This file was automatically generated. */\n");
|
| 60 |
- printf("#define CONFIG_FFT_FLOAT %d\n", !fixed);
|
|
| 60 |
+ printf("#define FFT_FLOAT %d\n", !fixed);
|
|
| 61 | 61 |
printf("#include \"libavcodec/%s\"\n", do_sin ? "rdft.h" : "fft.h");
|
| 62 | 62 |
for (i = 4; i <= BITS; i++) {
|
| 63 | 63 |
int m = 1 << i; |
| ... | ... |
@@ -19,7 +19,7 @@ |
| 19 | 19 |
#ifndef AVCODEC_FFT_INTERNAL_H |
| 20 | 20 |
#define AVCODEC_FFT_INTERNAL_H |
| 21 | 21 |
|
| 22 |
-#if CONFIG_FFT_FLOAT |
|
| 22 |
+#if FFT_FLOAT |
|
| 23 | 23 |
|
| 24 | 24 |
#define FIX15(v) (v) |
| 25 | 25 |
#define sqrthalf (float)M_SQRT1_2 |
| ... | ... |
@@ -62,7 +62,7 @@ void ff_mdct_calcw_c(FFTContext *s, FFTDouble *output, const FFTSample *input); |
| 62 | 62 |
#define CMULL(dre, dim, are, aim, bre, bim) \ |
| 63 | 63 |
CMULS(dre, dim, are, aim, bre, bim, 0) |
| 64 | 64 |
|
| 65 |
-#endif /* CONFIG_FFT_FLOAT */ |
|
| 65 |
+#endif /* FFT_FLOAT */ |
|
| 66 | 66 |
|
| 67 | 67 |
#define ff_imdct_calc_c FFT_NAME(ff_imdct_calc_c) |
| 68 | 68 |
#define ff_imdct_half_c FFT_NAME(ff_imdct_half_c) |
| ... | ... |
@@ -29,7 +29,7 @@ |
| 29 | 29 |
#include "libavutil/log.h" |
| 30 | 30 |
#include "libavutil/time.h" |
| 31 | 31 |
#include "fft.h" |
| 32 |
-#if CONFIG_FFT_FLOAT |
|
| 32 |
+#if FFT_FLOAT |
|
| 33 | 33 |
#include "dct.h" |
| 34 | 34 |
#include "rdft.h" |
| 35 | 35 |
#endif |
| ... | ... |
@@ -51,7 +51,7 @@ |
| 51 | 51 |
pim += (MUL16(are, bim) + MUL16(bre, aim));\ |
| 52 | 52 |
} |
| 53 | 53 |
|
| 54 |
-#if CONFIG_FFT_FLOAT |
|
| 54 |
+#if FFT_FLOAT |
|
| 55 | 55 |
# define RANGE 1.0 |
| 56 | 56 |
# define REF_SCALE(x, bits) (x) |
| 57 | 57 |
# define FMT "%10.6f" |
| ... | ... |
@@ -148,7 +148,7 @@ static void mdct_ref(FFTSample *output, FFTSample *input, int nbits) |
| 148 | 148 |
} |
| 149 | 149 |
} |
| 150 | 150 |
|
| 151 |
-#if CONFIG_FFT_FLOAT |
|
| 151 |
+#if FFT_FLOAT |
|
| 152 | 152 |
static void idct_ref(float *output, float *input, int nbits) |
| 153 | 153 |
{
|
| 154 | 154 |
int n = 1<<nbits; |
| ... | ... |
@@ -248,7 +248,7 @@ int main(int argc, char **argv) |
| 248 | 248 |
int do_inverse = 0; |
| 249 | 249 |
FFTContext s1, *s = &s1; |
| 250 | 250 |
FFTContext m1, *m = &m1; |
| 251 |
-#if CONFIG_FFT_FLOAT |
|
| 251 |
+#if FFT_FLOAT |
|
| 252 | 252 |
RDFTContext r1, *r = &r1; |
| 253 | 253 |
DCTContext d1, *d = &d1; |
| 254 | 254 |
int fft_size_2; |
| ... | ... |
@@ -320,7 +320,7 @@ int main(int argc, char **argv) |
| 320 | 320 |
ff_fft_init(s, fft_nbits, do_inverse); |
| 321 | 321 |
fft_ref_init(fft_nbits, do_inverse); |
| 322 | 322 |
break; |
| 323 |
-#if CONFIG_FFT_FLOAT |
|
| 323 |
+#if FFT_FLOAT |
|
| 324 | 324 |
case TRANSFORM_RDFT: |
| 325 | 325 |
if (do_inverse) |
| 326 | 326 |
av_log(NULL, AV_LOG_INFO,"IDFT_C2R"); |
| ... | ... |
@@ -375,7 +375,7 @@ int main(int argc, char **argv) |
| 375 | 375 |
fft_ref(tab_ref, tab1, fft_nbits); |
| 376 | 376 |
err = check_diff((FFTSample *)tab_ref, (FFTSample *)tab, fft_size * 2, 1.0); |
| 377 | 377 |
break; |
| 378 |
-#if CONFIG_FFT_FLOAT |
|
| 378 |
+#if FFT_FLOAT |
|
| 379 | 379 |
case TRANSFORM_RDFT: |
| 380 | 380 |
fft_size_2 = fft_size >> 1; |
| 381 | 381 |
if (do_inverse) {
|
| ... | ... |
@@ -444,7 +444,7 @@ int main(int argc, char **argv) |
| 444 | 444 |
memcpy(tab, tab1, fft_size * sizeof(FFTComplex)); |
| 445 | 445 |
s->fft_calc(s, tab); |
| 446 | 446 |
break; |
| 447 |
-#if CONFIG_FFT_FLOAT |
|
| 447 |
+#if FFT_FLOAT |
|
| 448 | 448 |
case TRANSFORM_RDFT: |
| 449 | 449 |
memcpy(tab2, tab1, fft_size * sizeof(FFTSample)); |
| 450 | 450 |
r->rdft_calc(r, tab2); |
| ... | ... |
@@ -474,7 +474,7 @@ int main(int argc, char **argv) |
| 474 | 474 |
case TRANSFORM_FFT: |
| 475 | 475 |
ff_fft_end(s); |
| 476 | 476 |
break; |
| 477 |
-#if CONFIG_FFT_FLOAT |
|
| 477 |
+#if FFT_FLOAT |
|
| 478 | 478 |
case TRANSFORM_RDFT: |
| 479 | 479 |
ff_rdft_end(r); |
| 480 | 480 |
break; |
| ... | ... |
@@ -22,15 +22,15 @@ |
| 22 | 22 |
#ifndef AVCODEC_FFT_H |
| 23 | 23 |
#define AVCODEC_FFT_H |
| 24 | 24 |
|
| 25 |
-#ifndef CONFIG_FFT_FLOAT |
|
| 26 |
-#define CONFIG_FFT_FLOAT 1 |
|
| 25 |
+#ifndef FFT_FLOAT |
|
| 26 |
+#define FFT_FLOAT 1 |
|
| 27 | 27 |
#endif |
| 28 | 28 |
|
| 29 | 29 |
#include <stdint.h> |
| 30 | 30 |
#include "config.h" |
| 31 | 31 |
#include "libavutil/mem.h" |
| 32 | 32 |
|
| 33 |
-#if CONFIG_FFT_FLOAT |
|
| 33 |
+#if FFT_FLOAT |
|
| 34 | 34 |
|
| 35 | 35 |
#include "avfft.h" |
| 36 | 36 |
|
| ... | ... |
@@ -51,7 +51,7 @@ typedef struct FFTComplex {
|
| 51 | 51 |
|
| 52 | 52 |
typedef struct FFTContext FFTContext; |
| 53 | 53 |
|
| 54 |
-#endif /* CONFIG_FFT_FLOAT */ |
|
| 54 |
+#endif /* FFT_FLOAT */ |
|
| 55 | 55 |
|
| 56 | 56 |
typedef struct FFTDComplex {
|
| 57 | 57 |
FFTDouble re, im; |
| ... | ... |
@@ -157,7 +157,7 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) |
| 157 | 157 |
s->mdct_calc = ff_mdct_calc_c; |
| 158 | 158 |
#endif |
| 159 | 159 |
|
| 160 |
-#if CONFIG_FFT_FLOAT |
|
| 160 |
+#if FFT_FLOAT |
|
| 161 | 161 |
if (ARCH_ARM) ff_fft_init_arm(s); |
| 162 | 162 |
if (ARCH_PPC) ff_fft_init_ppc(s); |
| 163 | 163 |
if (ARCH_X86) ff_fft_init_x86(s); |