diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/third_party/ffmpeg/libavcodec/fft.h | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/fft.h')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavcodec/fft.h | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/fft.h b/chromium/third_party/ffmpeg/libavcodec/fft.h index 9d92b2c2d26..217090cf2ac 100644 --- a/chromium/third_party/ffmpeg/libavcodec/fft.h +++ b/chromium/third_party/ffmpeg/libavcodec/fft.h @@ -26,6 +26,10 @@ #define CONFIG_FFT_FLOAT 1 #endif +#ifndef CONFIG_FFT_FIXED_32 +#define CONFIG_FFT_FIXED_32 0 +#endif + #include <stdint.h> #include "config.h" #include "libavutil/mem.h" @@ -40,15 +44,26 @@ typedef float FFTDouble; #else +#if CONFIG_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 */ + #define FFT_NAME(x) x ## _fixed typedef int16_t FFTSample; -typedef int FFTDouble; + +#endif /* CONFIG_FFT_FIXED_32 */ typedef struct FFTComplex { - int16_t re, im; + FFTSample re, im; } FFTComplex; +typedef int FFTDouble; typedef struct FFTContext FFTContext; #endif /* CONFIG_FFT_FLOAT */ @@ -133,14 +148,12 @@ void ff_init_ff_cos_tabs(int index); */ int ff_fft_init(FFTContext *s, int nbits, int inverse); -#if CONFIG_FFT_FLOAT -void ff_fft_init_altivec(FFTContext *s); void ff_fft_init_x86(FFTContext *s); void ff_fft_init_arm(FFTContext *s); void ff_fft_init_mips(FFTContext *s); -#else +void ff_fft_init_ppc(FFTContext *s); + void ff_fft_fixed_init_arm(FFTContext *s); -#endif void ff_fft_end(FFTContext *s); |