ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/aactab.c

 /*
  * AAC data
  * Copyright (c) 2005-2006 Oded Shimon ( ods15 ods15 dyndns org )
  * Copyright (c) 2006-2007 Maxim Gavrilov ( maxim.gavrilov gmail com )
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 391 matching lines @@
 };
 
 const uint16_t ff_aac_spectral_sizes[11] = {
     81, 81, 81, 81, 81, 81, 64, 64, 169, 169, 289,
 };
 
 /* NOTE:
  * 64.0f is a special value indicating the existence of an escape code in the
  * bitstream.
  */
-static const DECLARE_ALIGNED_16(float, codebook_vector0)[324] = {
+static const DECLARE_ALIGNED(16, float, codebook_vector0)[324] = {
  -1.0000000, -1.0000000, -1.0000000, -1.0000000,
  -1.0000000, -1.0000000, -1.0000000,  0.0000000,
  -1.0000000, -1.0000000, -1.0000000,  1.0000000,
  -1.0000000, -1.0000000,  0.0000000, -1.0000000,
  -1.0000000, -1.0000000,  0.0000000,  0.0000000,
  -1.0000000, -1.0000000,  0.0000000,  1.0000000,
  -1.0000000, -1.0000000,  1.0000000, -1.0000000,
  -1.0000000, -1.0000000,  1.0000000,  0.0000000,
  -1.0000000, -1.0000000,  1.0000000,  1.0000000,
  -1.0000000,  0.0000000, -1.0000000, -1.0000000,
@@ skipping 63 matching lines @@
   1.0000000,  1.0000000, -1.0000000,  0.0000000,
   1.0000000,  1.0000000, -1.0000000,  1.0000000,
   1.0000000,  1.0000000,  0.0000000, -1.0000000,
   1.0000000,  1.0000000,  0.0000000,  0.0000000,
   1.0000000,  1.0000000,  0.0000000,  1.0000000,
   1.0000000,  1.0000000,  1.0000000, -1.0000000,
   1.0000000,  1.0000000,  1.0000000,  0.0000000,
   1.0000000,  1.0000000,  1.0000000,  1.0000000,
 };
 
-static const DECLARE_ALIGNED_16(float, codebook_vector2)[324] = {
+static const DECLARE_ALIGNED(16, float, codebook_vector2)[324] = {
   0.0000000,  0.0000000,  0.0000000,  0.0000000,
   0.0000000,  0.0000000,  0.0000000,  1.0000000,
   0.0000000,  0.0000000,  0.0000000,  2.5198421,
   0.0000000,  0.0000000,  1.0000000,  0.0000000,
   0.0000000,  0.0000000,  1.0000000,  1.0000000,
   0.0000000,  0.0000000,  1.0000000,  2.5198421,
   0.0000000,  0.0000000,  2.5198421,  0.0000000,
   0.0000000,  0.0000000,  2.5198421,  1.0000000,
   0.0000000,  0.0000000,  2.5198421,  2.5198421,
   0.0000000,  1.0000000,  0.0000000,  0.0000000,
@@ skipping 63 matching lines @@
   2.5198421,  2.5198421,  0.0000000,  1.0000000,
   2.5198421,  2.5198421,  0.0000000,  2.5198421,
   2.5198421,  2.5198421,  1.0000000,  0.0000000,
   2.5198421,  2.5198421,  1.0000000,  1.0000000,
   2.5198421,  2.5198421,  1.0000000,  2.5198421,
   2.5198421,  2.5198421,  2.5198421,  0.0000000,
   2.5198421,  2.5198421,  2.5198421,  1.0000000,
   2.5198421,  2.5198421,  2.5198421,  2.5198421,
 };
 
-static const DECLARE_ALIGNED_16(float, codebook_vector4)[162] = {
+static const DECLARE_ALIGNED(16, float, codebook_vector4)[162] = {
  -6.3496042, -6.3496042, -6.3496042, -4.3267487,
  -6.3496042, -2.5198421, -6.3496042, -1.0000000,
  -6.3496042,  0.0000000, -6.3496042,  1.0000000,
  -6.3496042,  2.5198421, -6.3496042,  4.3267487,
  -6.3496042,  6.3496042, -4.3267487, -6.3496042,
  -4.3267487, -4.3267487, -4.3267487, -2.5198421,
  -4.3267487, -1.0000000, -4.3267487,  0.0000000,
  -4.3267487,  1.0000000, -4.3267487,  2.5198421,
  -4.3267487,  4.3267487, -4.3267487,  6.3496042,
  -2.5198421, -6.3496042, -2.5198421, -4.3267487,
@@ skipping 23 matching lines @@
   4.3267487, -1.0000000,  4.3267487,  0.0000000,
   4.3267487,  1.0000000,  4.3267487,  2.5198421,
   4.3267487,  4.3267487,  4.3267487,  6.3496042,
   6.3496042, -6.3496042,  6.3496042, -4.3267487,
   6.3496042, -2.5198421,  6.3496042, -1.0000000,
   6.3496042,  0.0000000,  6.3496042,  1.0000000,
   6.3496042,  2.5198421,  6.3496042,  4.3267487,
   6.3496042,  6.3496042,
 };
 
-static const DECLARE_ALIGNED_16(float, codebook_vector6)[128] = {
+static const DECLARE_ALIGNED(16, float, codebook_vector6)[128] = {
   0.0000000,  0.0000000,  0.0000000,  1.0000000,
   0.0000000,  2.5198421,  0.0000000,  4.3267487,
   0.0000000,  6.3496042,  0.0000000,  8.5498797,
   0.0000000, 10.9027236,  0.0000000, 13.3905183,
   1.0000000,  0.0000000,  1.0000000,  1.0000000,
   1.0000000,  2.5198421,  1.0000000,  4.3267487,
   1.0000000,  6.3496042,  1.0000000,  8.5498797,
   1.0000000, 10.9027236,  1.0000000, 13.3905183,
   2.5198421,  0.0000000,  2.5198421,  1.0000000,
   2.5198421,  2.5198421,  2.5198421,  4.3267487,
@@ skipping 14 matching lines @@
  10.9027236,  0.0000000, 10.9027236,  1.0000000,
  10.9027236,  2.5198421, 10.9027236,  4.3267487,
  10.9027236,  6.3496042, 10.9027236,  8.5498797,
  10.9027236, 10.9027236, 10.9027236, 13.3905183,
  13.3905183,  0.0000000, 13.3905183,  1.0000000,
  13.3905183,  2.5198421, 13.3905183,  4.3267487,
  13.3905183,  6.3496042, 13.3905183,  8.5498797,
  13.3905183, 10.9027236, 13.3905183, 13.3905183,
 };
 
-static const DECLARE_ALIGNED_16(float, codebook_vector8)[338] = {
+static const DECLARE_ALIGNED(16, float, codebook_vector8)[338] = {
   0.0000000,  0.0000000,  0.0000000,  1.0000000,
   0.0000000,  2.5198421,  0.0000000,  4.3267487,
   0.0000000,  6.3496042,  0.0000000,  8.5498797,
   0.0000000, 10.9027236,  0.0000000, 13.3905183,
   0.0000000, 16.0000000,  0.0000000, 18.7207544,
   0.0000000, 21.5443469,  0.0000000, 24.4637810,
   0.0000000, 27.4731418,  1.0000000,  0.0000000,
   1.0000000,  1.0000000,  1.0000000,  2.5198421,
   1.0000000,  4.3267487,  1.0000000,  6.3496042,
   1.0000000,  8.5498797,  1.0000000, 10.9027236,
@@ skipping 67 matching lines @@
  24.4637810, 24.4637810, 24.4637810, 27.4731418,
  27.4731418,  0.0000000, 27.4731418,  1.0000000,
  27.4731418,  2.5198421, 27.4731418,  4.3267487,
  27.4731418,  6.3496042, 27.4731418,  8.5498797,
  27.4731418, 10.9027236, 27.4731418, 13.3905183,
  27.4731418, 16.0000000, 27.4731418, 18.7207544,
  27.4731418, 21.5443469, 27.4731418, 24.4637810,
  27.4731418, 27.4731418,
 };
 
-static const DECLARE_ALIGNED_16(float, codebook_vector10)[578] = {
+static const DECLARE_ALIGNED(16, float, codebook_vector10)[578] = {
   0.0000000,  0.0000000,  0.0000000,  1.0000000,
   0.0000000,  2.5198421,  0.0000000,  4.3267487,
   0.0000000,  6.3496042,  0.0000000,  8.5498797,
   0.0000000, 10.9027236,  0.0000000, 13.3905183,
   0.0000000, 16.0000000,  0.0000000, 18.7207544,
   0.0000000, 21.5443469,  0.0000000, 24.4637810,
   0.0000000, 27.4731418,  0.0000000, 30.5673509,
   0.0000000, 33.7419917,  0.0000000, 36.9931811,
   0.0000000,      64.0f,  1.0000000,  0.0000000,
   1.0000000,  1.0000000,  1.0000000,  2.5198421,
@@ skipping 138 matching lines @@
     codebook_vector0, codebook_vector0, codebook_vector2,
     codebook_vector2, codebook_vector4, codebook_vector4,
     codebook_vector6, codebook_vector6, codebook_vector8,
     codebook_vector8, codebook_vector10,
 };
 
 static const float codebook_vector0_vals[] = {
    -1.0000000,  0.0000000,  1.0000000
 };
 
-static const float codebook_vector2_vals[] = {
-    0.0000000,  1.0000000,  2.5198421,
-};
-
 /*
  * bits  0:1, 2:3, 4:5, 6:7  index into _vals array
  *       8:11                number of non-zero values
  *      12:15                bit mask of non-zero values
  */
 static const uint16_t codebook_vector02_idx[] = {
     0x0000, 0x8140, 0x8180, 0x4110, 0xc250, 0xc290, 0x4120, 0xc260, 0xc2a0,
     0x2104, 0xa244, 0xa284, 0x6214, 0xe354, 0xe394, 0x6224, 0xe364, 0xe3a4,
     0x2108, 0xa248, 0xa288, 0x6218, 0xe358, 0xe398, 0x6228, 0xe368, 0xe3a8,
     0x1101, 0x9241, 0x9281, 0x5211, 0xd351, 0xd391, 0x5221, 0xd361, 0xd3a1,
@@ skipping 20 matching lines @@
     0x0001, 0x0011, 0x0021, 0x0031, 0x0041, 0x0051, 0x0061, 0x0071, 0x0081,
     0x0002, 0x0012, 0x0022, 0x0032, 0x0042, 0x0052, 0x0062, 0x0072, 0x0082,
     0x0003, 0x0013, 0x0023, 0x0033, 0x0043, 0x0053, 0x0063, 0x0073, 0x0083,
     0x0004, 0x0014, 0x0024, 0x0034, 0x0044, 0x0054, 0x0064, 0x0074, 0x0084,
     0x0005, 0x0015, 0x0025, 0x0035, 0x0045, 0x0055, 0x0065, 0x0075, 0x0085,
     0x0006, 0x0016, 0x0026, 0x0036, 0x0046, 0x0056, 0x0066, 0x0076, 0x0086,
     0x0007, 0x0017, 0x0027, 0x0037, 0x0047, 0x0057, 0x0067, 0x0077, 0x0087,
     0x0008, 0x0018, 0x0028, 0x0038, 0x0048, 0x0058, 0x0068, 0x0078, 0x0088,
 };
 
-static const float codebook_vector6_vals[] = {
-    0.0000000,  1.0000000,  2.5198421,  4.3267487,
-    6.3496042,  8.5498797, 10.9027236, 13.3905183,
-};
-
 /*
  * bits  0:3, 4:7  index into _vals array
  *       8:11      number of non-zero values
  *      12:15      1: only second value non-zero
  *                 0: other cases
  */
 static const uint16_t codebook_vector6_idx[] = {
     0x0000, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170,
     0x1101, 0x0211, 0x0221, 0x0231, 0x0241, 0x0251, 0x0261, 0x0271,
     0x1102, 0x0212, 0x0222, 0x0232, 0x0242, 0x0252, 0x0262, 0x0272,
     0x1103, 0x0213, 0x0223, 0x0233, 0x0243, 0x0253, 0x0263, 0x0273,
     0x1104, 0x0214, 0x0224, 0x0234, 0x0244, 0x0254, 0x0264, 0x0274,
     0x1105, 0x0215, 0x0225, 0x0235, 0x0245, 0x0255, 0x0265, 0x0275,
     0x1106, 0x0216, 0x0226, 0x0236, 0x0246, 0x0256, 0x0266, 0x0276,
     0x1107, 0x0217, 0x0227, 0x0237, 0x0247, 0x0257, 0x0267, 0x0277,
 };
 
-static const float codebook_vector8_vals[] = {
-     0.0000000,  1.0000000,
-     2.5198421,  4.3267487,
-     6.3496042,  8.5498797,
-    10.9027236, 13.3905183,
-    16.0000000, 18.7207544,
-    21.5443469, 24.4637810,
-    27.4731418,
-};
-
 /*
  * bits  0:3, 4:7  index into _vals array
  *       8:11      number of non-zero values
  *      12:15      1: only second value non-zero
  *                 0: other cases
  */
 static const uint16_t codebook_vector8_idx[] = {
   0x0000, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160,
   0x0170, 0x0180, 0x0190, 0x01a0, 0x01b0, 0x01c0,
   0x1101, 0x0211, 0x0221, 0x0231, 0x0241, 0x0251, 0x0261,
@@ skipping 69 matching lines @@
     0x208d, 0x209d, 0x20ad, 0x20bd, 0x20cd, 0x20dd, 0x20ed, 0x20fd, 0x220d,
     0x100e, 0x201e, 0x202e, 0x203e, 0x204e, 0x205e, 0x206e, 0x207e,
     0x208e, 0x209e, 0x20ae, 0x20be, 0x20ce, 0x20de, 0x20ee, 0x20fe, 0x220e,
     0x100f, 0x201f, 0x202f, 0x203f, 0x204f, 0x205f, 0x206f, 0x207f,
     0x208f, 0x209f, 0x20af, 0x20bf, 0x20cf, 0x20df, 0x20ef, 0x20ff, 0x220f,
     0x1100, 0x2110, 0x2120, 0x2130, 0x2140, 0x2150, 0x2160, 0x2170,
     0x2180, 0x2190, 0x21a0, 0x21b0, 0x21c0, 0x21d0, 0x21e0, 0x21f0, 0x2300,
 };
 
 const float *const ff_aac_codebook_vector_vals[] = {
-    codebook_vector0_vals, codebook_vector0_vals,
-    codebook_vector2_vals, codebook_vector2_vals,
-    codebook_vector4_vals, codebook_vector4_vals,
-    codebook_vector6_vals, codebook_vector6_vals,
-    codebook_vector8_vals, codebook_vector8_vals,
+    codebook_vector0_vals,  codebook_vector0_vals,
+    codebook_vector10_vals, codebook_vector10_vals,
+    codebook_vector4_vals,  codebook_vector4_vals,
+    codebook_vector10_vals, codebook_vector10_vals,
+    codebook_vector10_vals, codebook_vector10_vals,
     codebook_vector10_vals,
 };
 
 const uint16_t *const ff_aac_codebook_vector_idx[] = {
     codebook_vector02_idx, codebook_vector02_idx,
     codebook_vector02_idx, codebook_vector02_idx,
     codebook_vector4_idx,  codebook_vector4_idx,
     codebook_vector6_idx,  codebook_vector6_idx,
     codebook_vector8_idx,  codebook_vector8_idx,
     codebook_vector10_idx,
@@ skipping 256 matching lines @@
     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 */