X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Faactab.h;h=dc62d5f376096c609f54787676ddfa33dfe5c76f;hb=f988ce6cad8a98af1eaf260fb6995deac65542e5;hp=e900517be659cb6917bcddc53c0617d64208a8ef;hpb=fed3f0691492ed99fadac5da9c021c395884692d;p=ffmpeg

diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h
index e900517be65..dc62d5f3760 100644
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@@ -21,30 +21,54 @@
  */
 
 /**
- * @file aactab.h
+ * @file libavcodec/aactab.h
  * AAC data declarations
  * @author Oded Shimon  ( ods15 ods15 dyndns org )
  * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
  */
 
-#ifndef FFMPEG_AACTAB_H
-#define FFMPEG_AACTAB_H
+#ifndef AVCODEC_AACTAB_H
+#define AVCODEC_AACTAB_H
 
+#include "libavutil/mem.h"
 #include "aac.h"
 
 #include <stdint.h>
 
+/* NOTE:
+ * Tables in this file are used by the AAC decoder and will be used by the AAC
+ * 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
+ * @{
+ */
+extern const uint8_t ff_aac_num_swb_1024[];
+extern const uint8_t ff_aac_num_swb_128 [];
+// @}
+
+extern const uint8_t ff_aac_pred_sfb_max [];
+
 extern const uint32_t ff_aac_scalefactor_code[121];
 extern const uint8_t  ff_aac_scalefactor_bits[121];
 
-extern const uint16_t *ff_aac_spectral_codes[11];
-extern const uint8_t  *ff_aac_spectral_bits [11];
+extern const uint16_t * const ff_aac_spectral_codes[11];
+extern const uint8_t  * const ff_aac_spectral_bits [11];
 extern const uint16_t  ff_aac_spectral_sizes[11];
 
-extern const int8_t *ff_aac_codebook_vectors[];
+extern const float *ff_aac_codebook_vectors[];
 
-#ifdef CONFIG_HARDCODED_TABLES
-extern const float ff_aac_ivquant_tab[IVQUANT_SIZE];
+#if CONFIG_HARDCODED_TABLES
+extern const float ff_aac_pow2sf_tab[428];
+#else
+extern       float ff_aac_pow2sf_tab[428];
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* FFMPEG_AACTAB_H */
+#endif /* AVCODEC_AACTAB_H */