Mercurial > libavcodec.hg
changeset 10492:63910f7ba293 libavcodec
Pad ff_cos_tabs and ff_sin_tabs so that index n points to the table for n bits.
While this "wastes" up to 2x32 bytes it makes the code slightly simpler and
less confusing.
| author | reimar |
|---|---|
| date | Wed, 04 Nov 2009 17:30:23 +0000 |
| parents | 74e51b86b934 |
| children | 5f2ced30548b |
| files | dsputil.h fft.c rdft.c |
| diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/dsputil.h Tue Nov 03 22:50:02 2009 +0000 +++ b/dsputil.h Wed Nov 04 17:30:23 2009 +0000 @@ -767,7 +767,7 @@ extern COSTABLE(16384); extern COSTABLE(32768); extern COSTABLE(65536); -extern COSTABLE_CONST FFTSample* const ff_cos_tabs[13]; +extern COSTABLE_CONST FFTSample* const ff_cos_tabs[17]; extern SINTABLE(16); extern SINTABLE(32);
--- a/fft.c Tue Nov 03 22:50:02 2009 +0000 +++ b/fft.c Wed Nov 04 17:30:23 2009 +0000 @@ -45,6 +45,7 @@ COSTABLE(65536); #endif COSTABLE_CONST FFTSample * const ff_cos_tabs[] = { + NULL, NULL, NULL, NULL, ff_cos_16, ff_cos_32, ff_cos_64, ff_cos_128, ff_cos_256, ff_cos_512, ff_cos_1024, ff_cos_2048, ff_cos_4096, ff_cos_8192, ff_cos_16384, ff_cos_32768, ff_cos_65536, }; @@ -99,7 +100,7 @@ for(j=4; j<=nbits; j++) { int m = 1<<j; double freq = 2*M_PI/m; - FFTSample *tab = ff_cos_tabs[j-4]; + FFTSample *tab = ff_cos_tabs[j]; for(i=0; i<=m/4; i++) tab[i] = cos(i*freq); for(i=1; i<m/4; i++)
--- a/rdft.c Tue Nov 03 22:50:02 2009 +0000 +++ b/rdft.c Wed Nov 04 17:30:23 2009 +0000 @@ -43,6 +43,7 @@ SINTABLE(65536); #endif SINTABLE_CONST FFTSample * const ff_sin_tabs[] = { + NULL, NULL, NULL, NULL, ff_sin_16, ff_sin_32, ff_sin_64, ff_sin_128, ff_sin_256, ff_sin_512, ff_sin_1024, ff_sin_2048, ff_sin_4096, ff_sin_8192, ff_sin_16384, ff_sin_32768, ff_sin_65536, }; @@ -63,8 +64,8 @@ if (ff_fft_init(&s->fft, nbits-1, trans == IRDFT || trans == RIDFT) < 0) return -1; - s->tcos = ff_cos_tabs[nbits-4]; - s->tsin = ff_sin_tabs[nbits-4]+(trans == RDFT || trans == IRIDFT)*(n>>2); + s->tcos = ff_cos_tabs[nbits]; + s->tsin = ff_sin_tabs[nbits]+(trans == RDFT || trans == IRIDFT)*(n>>2); #if !CONFIG_HARDCODED_TABLES for (i = 0; i < (n>>2); i++) { s->tsin[i] = sin(i*theta);