X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Faactab.h;h=283d6c3a2d869ef27f658383d9d0a45d2b13e664;hb=843b5fd0fe07f988252d3b711e142785af26a0eb;hp=198b61c81aa7c8289d3c6a3ddc155f5a351efa1d;hpb=9cc04edff9fff54416bc9fe0f55dd65ed5deed60;p=ffmpeg

diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h
index 198b61c81aa..283d6c3a2d8 100644
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@@ -21,14 +21,14 @@
  */
 
 /**
- * @file aactab.h
+ * @file
  * 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"
@@ -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
  * @{
  */
@@ -47,18 +54,29 @@ 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[];
+extern const float *ff_aac_codebook_vector_vals[];
+extern const uint16_t *ff_aac_codebook_vector_idx[];
+
+extern const uint16_t * const ff_swb_offset_1024[13];
+extern const uint16_t * const ff_swb_offset_128 [13];
+
+extern const uint8_t ff_tns_max_bands_1024[13];
+extern const uint8_t ff_tns_max_bands_128 [13];
 
-#ifdef CONFIG_HARDCODED_TABLES
-extern const float ff_aac_ivquant_tab[IVQUANT_SIZE];
-extern const float ff_aac_pow2sf_tab[316];
+#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 */