Move the AVCodecContext options definition to a dedicated file, reduce

[ffmpeg] / libavcodec / aactab.c

diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c
index 2c30eeb51ae14d6c1ba621e0d95ffbbb20abaff8..3eab636cc4f6c9d46e1723a1cf61349849b157e8 100644 (file)
--- a/libavcodec/aactab.c
+++ b/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
 };
@@ -40,6 +43,10 @@ const uint8_t ff_aac_num_swb_128[] = {
     12, 12, 12, 14, 14, 14, 15, 15, 15, 15, 15, 15
 };
 
+const uint8_t ff_aac_pred_sfb_max[] = {
+    33, 33, 38, 40, 40, 40, 41, 41, 37, 37, 37, 34
+};
+
 const uint32_t ff_aac_scalefactor_code[121] = {
     0x3ffe8, 0x3ffe6, 0x3ffe7, 0x3ffe5, 0x7fff5, 0x7fff1, 0x7ffed, 0x7fff6,
     0x7ffee, 0x7ffef, 0x7fff0, 0x7fffc, 0x7fffd, 0x7ffff, 0x7fffe, 0x7fff7,
@@ -384,12 +391,12 @@ static const uint8_t bits11[289] = {
      5,
 };
 
-const uint16_t *ff_aac_spectral_codes[11] = {
+const uint16_t * const ff_aac_spectral_codes[11] = {
     codes1,  codes2,  codes3, codes4, codes5, codes6, codes7, codes8,
     codes9, codes10, codes11,
 };
 
-const uint8_t *ff_aac_spectral_bits[11] = {
+const uint8_t * const ff_aac_spectral_bits[11] = {
     bits1,  bits2,  bits3, bits4, bits5, bits6, bits7, bits8,
     bits9, bits10, bits11,
 };
@@ -885,7 +892,7 @@ static const float codebook_vector10[578] = {
       64.0f,      64.0f,
 };
 
-const float *ff_aac_codebook_vectors[] = {
+const float * const ff_aac_codebook_vectors[] = {
     codebook_vector0, codebook_vector0, codebook_vector2,
     codebook_vector2, codebook_vector4, codebook_vector4,
     codebook_vector6, codebook_vector6, codebook_vector8,
@@ -901,7 +908,7 @@ const float *ff_aac_codebook_vectors[] = {
  * [60, 315] scale factor decoding when using SIMD dsp.float_to_int16
  * [45, 300] intensity stereo position decoding mapped in reverse order i.e. 0->300, 1->299, ..., 254->46, 255->45
  */
-const float ff_aac_pow2sf_tab[316] = {
+const float ff_aac_pow2sf_tab[428] = {
     8.88178420e-16, 1.05622810e-15, 1.25607397e-15, 1.49373210e-15,
     1.77635684e-15, 2.11245619e-15, 2.51214793e-15, 2.98746420e-15,
     3.55271368e-15, 4.22491238e-15, 5.02429587e-15, 5.97492839e-15,
@@ -981,6 +988,38 @@ const float ff_aac_pow2sf_tab[316] = {
     6.71088640e+07, 7.98063385e+07, 9.49062656e+07, 1.12863206e+08,
     1.34217728e+08, 1.59612677e+08, 1.89812531e+08, 2.25726413e+08,
     2.68435456e+08, 3.19225354e+08, 3.79625062e+08, 4.51452825e+08,
+    5.36870912e+08, 6.38450708e+08, 7.59250125e+08, 9.02905651e+08,
+    1.07374182e+09, 1.27690142e+09, 1.51850025e+09, 1.80581130e+09,
+    2.14748365e+09, 2.55380283e+09, 3.03700050e+09, 3.61162260e+09,
+    4.29496730e+09, 5.10760567e+09, 6.07400100e+09, 7.22324521e+09,
+    8.58993459e+09, 1.02152113e+10, 1.21480020e+10, 1.44464904e+10,
+    1.71798692e+10, 2.04304227e+10, 2.42960040e+10, 2.88929808e+10,
+    3.43597384e+10, 4.08608453e+10, 4.85920080e+10, 5.77859616e+10,
+    6.87194767e+10, 8.17216907e+10, 9.71840160e+10, 1.15571923e+11,
+    1.37438953e+11, 1.63443381e+11, 1.94368032e+11, 2.31143847e+11,
+    2.74877907e+11, 3.26886763e+11, 3.88736064e+11, 4.62287693e+11,
+    5.49755814e+11, 6.53773525e+11, 7.77472128e+11, 9.24575386e+11,
+    1.09951163e+12, 1.30754705e+12, 1.55494426e+12, 1.84915077e+12,
+    2.19902326e+12, 2.61509410e+12, 3.10988851e+12, 3.69830155e+12,
+    4.39804651e+12, 5.23018820e+12, 6.21977702e+12, 7.39660309e+12,
+    8.79609302e+12, 1.04603764e+13, 1.24395540e+13, 1.47932062e+13,
+    1.75921860e+13, 2.09207528e+13, 2.48791081e+13, 2.95864124e+13,
+    3.51843721e+13, 4.18415056e+13, 4.97582162e+13, 5.91728247e+13,
+    7.03687442e+13, 8.36830112e+13, 9.95164324e+13, 1.18345649e+14,
+    1.40737488e+14, 1.67366022e+14, 1.99032865e+14, 2.36691299e+14,
+    2.81474977e+14, 3.34732045e+14, 3.98065730e+14, 4.73382598e+14,
+    5.62949953e+14, 6.69464090e+14, 7.96131459e+14, 9.46765196e+14,
+    1.12589991e+15, 1.33892818e+15, 1.59226292e+15, 1.89353039e+15,
+    2.25179981e+15, 2.67785636e+15, 3.18452584e+15, 3.78706078e+15,
+    4.50359963e+15, 5.35571272e+15, 6.36905167e+15, 7.57412156e+15,
+    9.00719925e+15, 1.07114254e+16, 1.27381033e+16, 1.51482431e+16,
+    1.80143985e+16, 2.14228509e+16, 2.54762067e+16, 3.02964863e+16,
+    3.60287970e+16, 4.28457018e+16, 5.09524134e+16, 6.05929725e+16,
+    7.20575940e+16, 8.56914035e+16, 1.01904827e+17, 1.21185945e+17,
 };
 
+#else
+
+float ff_aac_pow2sf_tab[428];
+
 #endif /* CONFIG_HARDCODED_TABLES */