aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/fft.h
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-03-19 23:44:00 +0000
committerMans Rullgard <mans@mansr.com>2011-03-20 13:25:19 +0000
commit4538729afed44a0ee0a762d3ef69aa4bbb7f10b3 (patch)
tree746f6f85406a0100bff5684c1055c8922761d020 /libavcodec/fft.h
parenta45fbda994df54600101e845e29f0af60e456e95 (diff)
downloadffmpeg-4538729afed44a0ee0a762d3ef69aa4bbb7f10b3.tar.gz
Move sine windows to a separate file
These windows do not really belong in fft/mdct files and were easily confused with the similarly named tables used by rdft. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/fft.h')
-rw-r--r--libavcodec/fft.h26
1 files changed, 1 insertions, 25 deletions
diff --git a/libavcodec/fft.h b/libavcodec/fft.h
index 88fd325dfa..f10ef89621 100644
--- a/libavcodec/fft.h
+++ b/libavcodec/fft.h
@@ -62,19 +62,16 @@ struct FFTContext {
#if CONFIG_HARDCODED_TABLES
#define COSTABLE_CONST const
#define SINTABLE_CONST const
-#define SINETABLE_CONST const
#else
#define COSTABLE_CONST
#define SINTABLE_CONST
-#define SINETABLE_CONST
#endif
#define COSTABLE(size) \
COSTABLE_CONST DECLARE_ALIGNED(16, FFTSample, ff_cos_##size)[size/2]
#define SINTABLE(size) \
SINTABLE_CONST DECLARE_ALIGNED(16, FFTSample, ff_sin_##size)[size/2]
-#define SINETABLE(size) \
- SINETABLE_CONST DECLARE_ALIGNED(16, float, ff_sine_##size)[size]
+
extern COSTABLE(16);
extern COSTABLE(32);
extern COSTABLE(64);
@@ -124,27 +121,6 @@ void ff_dct_init_mmx(DCTContext *s);
void ff_fft_end(FFTContext *s);
-/**
- * Generate a sine window.
- * @param window pointer to half window
- * @param n size of half window
- */
-void ff_sine_window_init(float *window, int n);
-
-/**
- * initialize the specified entry of ff_sine_windows
- */
-void ff_init_ff_sine_windows(int index);
-extern SINETABLE( 32);
-extern SINETABLE( 64);
-extern SINETABLE( 128);
-extern SINETABLE( 256);
-extern SINETABLE( 512);
-extern SINETABLE(1024);
-extern SINETABLE(2048);
-extern SINETABLE(4096);
-extern SINETABLE_CONST float * const ff_sine_windows[13];
-
int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale);
void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input);
void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input);