diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/fft-test.c')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavcodec/fft-test.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/fft-test.c b/chromium/third_party/ffmpeg/libavcodec/fft-test.c index d650a10844b..a29896fde78 100644 --- a/chromium/third_party/ffmpeg/libavcodec/fft-test.c +++ b/chromium/third_party/ffmpeg/libavcodec/fft-test.c @@ -29,7 +29,7 @@ #include "libavutil/log.h" #include "libavutil/time.h" #include "fft.h" -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT #include "dct.h" #include "rdft.h" #endif @@ -51,11 +51,11 @@ pim += (MUL16(are, bim) + MUL16(bre, aim));\ } -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT # 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" @@ -75,7 +75,7 @@ static void fft_ref_init(int nbits, int inverse) double c1, s1, alpha; n = 1 << nbits; - exptab = av_malloc((n / 2) * sizeof(*exptab)); + exptab = av_malloc_array((n / 2), sizeof(*exptab)); for (i = 0; i < (n/2); i++) { alpha = 2 * M_PI * (float)i / (float)n; @@ -152,7 +152,7 @@ static void mdct_ref(FFTSample *output, FFTSample *input, int nbits) } } -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT static void idct_ref(FFTSample *output, FFTSample *input, int nbits) { int n = 1<<nbits; @@ -252,7 +252,7 @@ int main(int argc, char **argv) int do_inverse = 0; FFTContext s1, *s = &s1; FFTContext m1, *m = &m1; -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT RDFTContext r1, *r = &r1; DCTContext d1, *d = &d1; int fft_size_2; @@ -304,10 +304,10 @@ int main(int argc, char **argv) } 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)); switch (transform) { case TRANSFORM_MDCT: @@ -326,7 +326,7 @@ int main(int argc, char **argv) ff_fft_init(s, fft_nbits, do_inverse); fft_ref_init(fft_nbits, do_inverse); break; -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT case TRANSFORM_RDFT: if (do_inverse) av_log(NULL, AV_LOG_INFO,"IDFT_C2R"); @@ -383,7 +383,7 @@ int main(int argc, char **argv) fft_ref(tab_ref, tab1, fft_nbits); err = check_diff((FFTSample *)tab_ref, (FFTSample *)tab, fft_size * 2, 1.0); break; -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT case TRANSFORM_RDFT: fft_size_2 = fft_size >> 1; if (do_inverse) { @@ -452,7 +452,7 @@ int main(int argc, char **argv) memcpy(tab, tab1, fft_size * sizeof(FFTComplex)); s->fft_calc(s, tab); break; -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT case TRANSFORM_RDFT: memcpy(tab2, tab1, fft_size * sizeof(FFTSample)); r->rdft_calc(r, tab2); @@ -482,7 +482,7 @@ int main(int argc, char **argv) case TRANSFORM_FFT: ff_fft_end(s); break; -#if CONFIG_FFT_FLOAT +#if FFT_FLOAT case TRANSFORM_RDFT: ff_rdft_end(r); break; |