diff rdft.c @ 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.

--- 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);