More OKed AAC decoder hunks

Originally committed as revision 14774 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/aac.h

@@ -45,6 +45,9 @@
 #define MAX_CHANNELS 64
 #define MAX_ELEM_ID 16
 
+#define TNS_MAX_ORDER 20
+#define PNS_MEAN_ENERGY 3719550720.0f // sqrt(3.0) * 1<<31
+
 enum AudioObjectType {
     AOT_NULL,
                                // Support?                Name

libavcodec/aactab.c

@@ -32,6 +32,9 @@
 
 #include <stdint.h>
 
+DECLARE_ALIGNED(16, float,  ff_aac_kbd_long_1024[1024]);
+DECLARE_ALIGNED(16, float,  ff_aac_kbd_short_128[128]);
+
 const uint8_t ff_aac_num_swb_1024[] = {
     41, 41, 47, 49, 49, 51, 47, 47, 43, 43, 43, 40
 };
@@ -983,4 +986,8 @@ const float ff_aac_pow2sf_tab[316] = {
     2.68435456e+08, 3.19225354e+08, 3.79625062e+08, 4.51452825e+08,
 };
 
+#else
+
+float ff_aac_pow2sf_tab[316];
+
 #endif /* CONFIG_HARDCODED_TABLES */

libavcodec/aactab.h

@@ -40,6 +40,13 @@
  * encoder.
  */
 
+/* @name window coefficients
+ * @{
+ */
+DECLARE_ALIGNED(16, extern float,  ff_aac_kbd_long_1024[1024]);
+DECLARE_ALIGNED(16, extern float,  ff_aac_kbd_short_128[128]);
+// @}
+
 /* @name number of scalefactor window bands for long and short transform windows respectively
  * @{
  */
@@ -58,6 +65,8 @@ extern const float *ff_aac_codebook_vectors[];
 
 #ifdef CONFIG_HARDCODED_TABLES
 extern const float ff_aac_pow2sf_tab[316];
+#else
+extern       float ff_aac_pow2sf_tab[316];
 #endif /* CONFIG_HARDCODED_TABLES */
 
 #endif /* FFMPEG_AACTAB_H */