eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-19 05:20:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add ff_init_ff_cos_tabs function and use it in rdft.c to ensure that the

Browse Source 
necessary ff_cos_tabs tables are initialized.
Fixes issue 1507 (QDM2 broken since r20237 without hardcoded tables).

Originally committed as revision 20464 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger
2009-11-05 18:29:06 +00:00
parent 9cad7e2193
commit 1ffc6e8327
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dsputil.h
View File

@@ -769,6 +769,12 @@ extern COSTABLE(32768);
extern COSTABLE(65536); extern COSTABLE(65536);
extern COSTABLE_CONST FFTSample* const ff_cos_tabs[17]; extern COSTABLE_CONST FFTSample* const ff_cos_tabs[17];
/**
* Initializes the cosine table in ff_cos_tabs[index]
* \param index index in ff_cos_tabs array of the table to initialize
*/
void ff_init_ff_cos_tabs(int index);
extern SINTABLE(16); extern SINTABLE(16);
extern SINTABLE(32); extern SINTABLE(32);
extern SINTABLE(64); extern SINTABLE(64);

24
libavcodec/fft.c
View File

@@ -61,6 +61,20 @@ static int split_radix_permutation(int i, int n, int inverse)
else return split_radix_permutation(i, m, inverse)*4 - 1; else return split_radix_permutation(i, m, inverse)*4 - 1;
} }
av_cold void ff_init_ff_cos_tabs(int index)
{
#if !CONFIG_HARDCODED_TABLES
int i;
int m = 1<<index;
double freq = 2*M_PI/m;
FFTSample *tab = ff_cos_tabs[index];
for(i=0; i<=m/4; i++)
tab[i] = cos(i*freq);
for(i=1; i<m/4; i++)
tab[m/2-i] = tab[i];
#endif
}
av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse)
{ {
int i, j, m, n; int i, j, m, n;
@@ -96,17 +110,9 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse)
if (HAVE_MMX) ff_fft_init_mmx(s); if (HAVE_MMX) ff_fft_init_mmx(s);
if (s->split_radix) { if (s->split_radix) {
#if !CONFIG_HARDCODED_TABLES
for(j=4; j<=nbits; j++) { for(j=4; j<=nbits; j++) {
int m = 1<<j; ff_init_ff_cos_tabs(j);
double freq = 2*M_PI/m;
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++)
tab[m/2-i] = tab[i];
} }
#endif
for(i=0; i<n; i++) for(i=0; i<n; i++)
s->revtab[-split_radix_permutation(i, n, s->inverse) & (n-1)] = i; s->revtab[-split_radix_permutation(i, n, s->inverse) & (n-1)] = i;
s->tmp_buf = av_malloc(n * sizeof(FFTComplex)); s->tmp_buf = av_malloc(n * sizeof(FFTComplex));

1
libavcodec/rdft.c
View File

@@ -64,6 +64,7 @@ av_cold int ff_rdft_init(RDFTContext *s, int nbits, enum RDFTransformType trans)
if (ff_fft_init(&s->fft, nbits-1, trans == IRDFT || trans == RIDFT) < 0) if (ff_fft_init(&s->fft, nbits-1, trans == IRDFT || trans == RIDFT) < 0)
return -1; return -1;
ff_init_ff_cos_tabs(nbits);
s->tcos = ff_cos_tabs[nbits]; s->tcos = ff_cos_tabs[nbits];
s->tsin = ff_sin_tabs[nbits]+(trans == RDFT || trans == IRIDFT)*(n>>2); s->tsin = ff_sin_tabs[nbits]+(trans == RDFT || trans == IRIDFT)*(n>>2);
#if !CONFIG_HARDCODED_TABLES #if !CONFIG_HARDCODED_TABLES