diff options
Diffstat (limited to 'libavcodec/fft-test.c')
| -rw-r--r-- | libavcodec/fft-test.c | 56 |
1 files changed, 31 insertions, 25 deletions
diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c index b7c83cf800..ba26f81f44 100644 --- a/libavcodec/fft-test.c +++ b/libavcodec/fft-test.c @@ -1,20 +1,20 @@ /* * (c) 2002 Fabrice Bellard * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -59,6 +59,10 @@ #define RANGE 1.0 #define REF_SCALE(x, bits) (x) #define FMT "%10.6f" +#elif FFT_FIXED_32 +#define RANGE 8388608 +#define REF_SCALE(x, bits) (x) +#define FMT "%6d" #else #define RANGE 16384 #define REF_SCALE(x, bits) ((x) / (1 << (bits))) @@ -73,7 +77,7 @@ static int fft_ref_init(int nbits, int inverse) { int i, n = 1 << nbits; - exptab = av_malloc((n / 2) * sizeof(*exptab)); + exptab = av_malloc_array((n / 2), sizeof(*exptab)); if (!exptab) return AVERROR(ENOMEM); @@ -150,7 +154,7 @@ static void mdct_ref(FFTSample *output, FFTSample *input, int nbits) #if FFT_FLOAT #if CONFIG_DCT -static void idct_ref(float *output, float *input, int nbits) +static void idct_ref(FFTSample *output, FFTSample *input, int nbits) { int i, k, n = 1 << nbits; @@ -165,7 +169,7 @@ static void idct_ref(float *output, float *input, int nbits) } } -static void dct_ref(float *output, float *input, int nbits) +static void dct_ref(FFTSample *output, FFTSample *input, int nbits) { int i, k, n = 1 << nbits; @@ -203,7 +207,7 @@ static int check_diff(FFTSample *tab1, FFTSample *tab2, int n, double scale) if (e > max) max = e; } - av_log(NULL, AV_LOG_INFO, "max:%f e:%g\n", max, sqrt(error) / n); + av_log(NULL, AV_LOG_INFO, "max:%f e:%g\n", max, sqrt(error / n)); return err; } @@ -281,20 +285,22 @@ int main(int argc, char **argv) break; case 'c': { - int cpuflags = av_parse_cpu_flags(optarg); - if (cpuflags < 0) + int cpuflags = av_get_cpu_flags(); + + if (av_parse_cpu_caps(&cpuflags, optarg) < 0) return 1; - av_set_cpu_flags_mask(cpuflags); + + av_force_cpu_flags(cpuflags); break; } } } fft_size = 1 << fft_nbits; - tab = av_malloc(fft_size * sizeof(FFTComplex)); - tab1 = av_malloc(fft_size * sizeof(FFTComplex)); - tab_ref = av_malloc(fft_size * sizeof(FFTComplex)); - tab2 = av_malloc(fft_size * sizeof(FFTSample)); + tab = av_malloc_array(fft_size, sizeof(FFTComplex)); + tab1 = av_malloc_array(fft_size, sizeof(FFTComplex)); + tab_ref = av_malloc_array(fft_size, sizeof(FFTComplex)); + tab2 = av_malloc_array(fft_size, sizeof(FFTSample)); if (!(tab && tab1 && tab_ref && tab2)) goto cleanup; @@ -316,22 +322,22 @@ int main(int argc, char **argv) else av_log(NULL, AV_LOG_INFO, "FFT"); ff_fft_init(&s, fft_nbits, do_inverse); - if (err = fft_ref_init(fft_nbits, do_inverse) < 0) + if ((err = fft_ref_init(fft_nbits, do_inverse)) < 0) goto cleanup; break; #if FFT_FLOAT -#if CONFIG_RDFT +# if CONFIG_RDFT case TRANSFORM_RDFT: if (do_inverse) av_log(NULL, AV_LOG_INFO, "IDFT_C2R"); else av_log(NULL, AV_LOG_INFO, "DFT_R2C"); ff_rdft_init(&r, fft_nbits, do_inverse ? IDFT_C2R : DFT_R2C); - if (err = fft_ref_init(fft_nbits, do_inverse) < 0) + if ((err = fft_ref_init(fft_nbits, do_inverse)) < 0) goto cleanup; break; -#endif /* CONFIG_RDFT */ -#if CONFIG_DCT +# endif /* CONFIG_RDFT */ +# if CONFIG_DCT case TRANSFORM_DCT: if (do_inverse) av_log(NULL, AV_LOG_INFO, "DCT_III"); @@ -339,7 +345,7 @@ int main(int argc, char **argv) av_log(NULL, AV_LOG_INFO, "DCT_II"); ff_dct_init(&d, fft_nbits, do_inverse ? DCT_III : DCT_II); break; -#endif /* CONFIG_DCT */ +# endif /* CONFIG_DCT */ #endif /* FFT_FLOAT */ default: av_log(NULL, AV_LOG_ERROR, "Requested transform not supported\n"); @@ -486,16 +492,16 @@ int main(int argc, char **argv) ff_fft_end(&s); break; #if FFT_FLOAT -#if CONFIG_RDFT +# if CONFIG_RDFT case TRANSFORM_RDFT: ff_rdft_end(&r); break; -#endif /* CONFIG_RDFT */ -#if CONFIG_DCT +# endif /* CONFIG_RDFT */ +# if CONFIG_DCT case TRANSFORM_DCT: ff_dct_end(&d); break; -#endif /* CONFIG_DCT */ +# endif /* CONFIG_DCT */ #endif /* FFT_FLOAT */ } |