Mercurial > libavcodec.hg
diff x86/fft_3dn2.c @ 10199:38ab367d4231 libavcodec
Merge FFTContext and MDCTContext
author | mru |
---|---|
date | Sun, 20 Sep 2009 17:30:20 +0000 |
parents | 5cf49858179a |
children | 34a65026fa06 |
line wrap: on
line diff
--- a/x86/fft_3dn2.c Sun Sep 20 17:18:59 2009 +0000 +++ b/x86/fft_3dn2.c Sun Sep 20 17:30:20 2009 +0000 @@ -53,14 +53,14 @@ FFSWAP(FFTSample, z[i].im, z[i+1].re); } -void ff_imdct_half_3dn2(MDCTContext *s, FFTSample *output, const FFTSample *input) +void ff_imdct_half_3dn2(FFTContext *s, FFTSample *output, const FFTSample *input) { x86_reg j, k; - long n = 1 << s->nbits; + long n = 1 << s->mdct_bits; long n2 = n >> 1; long n4 = n >> 2; long n8 = n >> 3; - const uint16_t *revtab = s->fft.revtab; + const uint16_t *revtab = s->revtab; const FFTSample *tcos = s->tcos; const FFTSample *tsin = s->tsin; const FFTSample *in1, *in2; @@ -101,7 +101,7 @@ ); } - ff_fft_dispatch_3dn2(z, s->fft.nbits); + ff_fft_dispatch_3dn2(z, s->nbits); #define CMUL(j,mm0,mm1)\ "movq (%2,"#j",2), %%mm6 \n"\ @@ -144,10 +144,10 @@ __asm__ volatile("femms"); } -void ff_imdct_calc_3dn2(MDCTContext *s, FFTSample *output, const FFTSample *input) +void ff_imdct_calc_3dn2(FFTContext *s, FFTSample *output, const FFTSample *input) { x86_reg j, k; - long n = 1 << s->nbits; + long n = 1 << s->mdct_bits; long n4 = n >> 2; ff_imdct_half_3dn2(s, output+n4, input);