comparison atrac1.c @ 10199:38ab367d4231 libavcodec

Merge FFTContext and MDCTContext
author mru
date Sun, 20 Sep 2009 17:30:20 +0000
parents 78af613fc316
children a43faa684a20
comparison
equal deleted inserted replaced
10198:78af613fc316 10199:38ab367d4231
77 DECLARE_ALIGNED_16(float, low[256]); 77 DECLARE_ALIGNED_16(float, low[256]);
78 DECLARE_ALIGNED_16(float, mid[256]); 78 DECLARE_ALIGNED_16(float, mid[256]);
79 DECLARE_ALIGNED_16(float, high[512]); 79 DECLARE_ALIGNED_16(float, high[512]);
80 float* bands[3]; 80 float* bands[3];
81 DECLARE_ALIGNED_16(float, out_samples[AT1_MAX_CHANNELS][AT1_SU_SAMPLES]); 81 DECLARE_ALIGNED_16(float, out_samples[AT1_MAX_CHANNELS][AT1_SU_SAMPLES]);
82 MDCTContext mdct_ctx[3]; 82 FFTContext mdct_ctx[3];
83 int channels; 83 int channels;
84 DSPContext dsp; 84 DSPContext dsp;
85 } AT1Ctx; 85 } AT1Ctx;
86 86
87 DECLARE_ALIGNED_16(static float, short_window[32]); 87 DECLARE_ALIGNED_16(static float, short_window[32]);
92 92
93 93
94 static void at1_imdct(AT1Ctx *q, float *spec, float *out, int nbits, 94 static void at1_imdct(AT1Ctx *q, float *spec, float *out, int nbits,
95 int rev_spec) 95 int rev_spec)
96 { 96 {
97 MDCTContext* mdct_context; 97 FFTContext* mdct_context;
98 int transf_size = 1 << nbits; 98 int transf_size = 1 << nbits;
99 99
100 mdct_context = &q->mdct_ctx[nbits - 5 - (nbits > 6)]; 100 mdct_context = &q->mdct_ctx[nbits - 5 - (nbits > 6)];
101 101
102 if (rev_spec) { 102 if (rev_spec) {