[FFmpeg-cvslog] aacdec: Tables for length 480 AAC ELD.

Niel van der Westhuizen git at videolan.org
Wed Feb 4 13:48:42 CET 2015


ffmpeg | branch: master | Niel van der Westhuizen <espes at pequalsnp.com> | Wed Jan 21 21:25:27 2015 -0800| [7640c4a371a97899dfb443d980fd0bf8ac587754] | committer: Alex Converse

aacdec: Tables for length 480 AAC ELD.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7640c4a371a97899dfb443d980fd0bf8ac587754
---

 libavcodec/aacdec.c |    2 +-
 libavcodec/aactab.c |  494 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 libavcodec/aactab.h |    6 +-
 3 files changed, 499 insertions(+), 3 deletions(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 80dc79d..f868b7f 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2457,7 +2457,7 @@ static void imdct_and_windowing_eld(AACContext *ac, SingleChannelElement *sce)
     float *in    = sce->coeffs;
     float *out   = sce->ret;
     float *saved = sce->saved;
-    const float *const window = ff_aac_eld_window;
+    const float *const window = ff_aac_eld_window_512;
     float *buf  = ac->buf_mdct;
     int i;
     const int n  = 512;
diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c
index ee9a735..9f1e8af 100644
--- a/libavcodec/aactab.c
+++ b/libavcodec/aactab.c
@@ -44,6 +44,10 @@ const uint8_t ff_aac_num_swb_512[] = {
      0,  0,  0, 36, 36, 37, 31, 31,  0,  0,  0,  0,  0
 };
 
+const uint8_t ff_aac_num_swb_480[] = {
+     0,  0,  0, 35, 35, 37, 30, 30,  0,  0,  0,  0,  0
+};
+
 const uint8_t ff_aac_num_swb_128[] = {
     12, 12, 12, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15
 };
@@ -1126,6 +1130,14 @@ static const uint16_t swb_offset_512_48[] = {
     364, 396, 428, 460, 512
 };
 
+static const uint16_t swb_offset_480_48[] = {
+      0,   4,   8,  12,  16,  20,  24,  28,
+     32,  36,  40,  44,  48,  52,  56,  64,
+     72,  80,  88,  96, 108, 120, 132, 144,
+    156, 172, 188, 212, 240, 272, 304, 336,
+    368, 400, 432, 480
+};
+
 static const uint16_t swb_offset_128_48[] = {
      0,   4,   8,  12,  16,  20,  28,  36,
     44,  56,  68,  80,  96, 112, 128
@@ -1149,6 +1161,14 @@ static const uint16_t swb_offset_512_32[] = {
     352, 384, 416, 448, 480, 512
 };
 
+static const uint16_t swb_offset_480_32[] = {
+      0,   4,   8,  12,  16,  20,  24,  28,
+     32,  36,  40,  44,  48,  52,  56,  60,
+     64,  72,  80,  88,  96, 104, 112, 124,
+    136, 148, 164, 180, 200, 224, 256, 288,
+    320, 352, 384, 416, 448, 480
+ };
+
 static const uint16_t swb_offset_1024_24[] = {
       0,   4,   8,  12,  16,  20,  24,  28,
      32,  36,  40,  44,  52,  60,  68,  76,
@@ -1165,6 +1185,13 @@ static const uint16_t swb_offset_512_24[] = {
     288, 320, 352, 384, 416, 448, 480, 512,
 };
 
+static const uint16_t swb_offset_480_24[] = {
+      0,   4,   8,  12,  16,  20,  24,  28,
+     32,  36,  40,  44,  52,  60,  68,  80,
+     92, 104, 120, 140, 164, 192, 224, 256,
+    288, 320, 352, 384, 416, 448, 480
+};
+
 static const uint16_t swb_offset_128_24[] = {
      0,   4,   8,  12,  16,  20,  24,  28,
     36,  44,  52,  64,  76,  92, 108, 128
@@ -1214,6 +1241,14 @@ const uint16_t * const ff_swb_offset_512[] = {
     NULL
 };
 
+const uint16_t * const ff_swb_offset_480[] = {
+    NULL,               NULL,               NULL,
+    swb_offset_480_48,  swb_offset_480_48,  swb_offset_480_32,
+    swb_offset_480_24,  swb_offset_480_24,  NULL,
+    NULL,               NULL,               NULL,
+    NULL
+};
+
 const uint16_t * const ff_swb_offset_128[] = {
     /* The last entry on the following row is swb_offset_128_64 but is a
        duplicate of swb_offset_128_96. */
@@ -1240,12 +1275,16 @@ const uint8_t ff_tns_max_bands_512[] = {
     0, 0, 0, 31, 32, 37, 31, 31, 0, 0, 0, 0, 0
 };
 
+const uint8_t ff_tns_max_bands_480[] = {
+    0, 0, 0, 31, 32, 37, 30, 30, 0, 0, 0, 0, 0
+};
+
 const uint8_t ff_tns_max_bands_128[] = {
     9, 9, 10, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14
 };
 // @}
 
-const DECLARE_ALIGNED(32, float, ff_aac_eld_window)[1920] = {
+const DECLARE_ALIGNED(32, float, ff_aac_eld_window_512)[1920] = {
      0.00338834,  0.00567745,  0.00847677,  0.01172641,
      0.01532555,  0.01917664,  0.02318809,  0.02729259,
      0.03144503,  0.03560261,  0.03972499,  0.04379783,
@@ -1727,3 +1766,456 @@ const DECLARE_ALIGNED(32, float, ff_aac_eld_window)[1920] = {
     -0.00116552, -0.00115223, -0.00113877, -0.00112517,
     -0.00111144, -0.00109764, -0.00108377, -0.00106989,
 };
+
+const DECLARE_ALIGNED(32, float, ff_aac_eld_window_480)[1800] = {
+     0.00101191,  0.00440397,  0.00718669,  0.01072130,
+     0.01459757,  0.01875954,  0.02308987,  0.02751541,
+     0.03198130,  0.03643738,  0.04085290,  0.04522835,
+     0.04957620,  0.05390454,  0.05821503,  0.06251214,
+     0.06680463,  0.07109582,  0.07538014,  0.07965207,
+     0.08390857,  0.08815177,  0.09238785,  0.09662163,
+     0.10085860,  0.10510892,  0.10938110,  0.11367819,
+     0.11800355,  0.12236410,  0.12676834,  0.13122384,
+     0.13573476,  0.14030106,  0.14492340,  0.14960315,
+     0.15433828,  0.15912396,  0.16395663,  0.16883310,
+     0.17374837,  0.17869679,  0.18367394,  0.18867661,
+     0.19370368,  0.19875413,  0.20382641,  0.20892055,
+     0.21403775,  0.21917761,  0.22433899,  0.22952250,
+     0.23472991,  0.23996189,  0.24521859,  0.25049930,
+     0.25580312,  0.26112942,  0.26647748,  0.27184703,
+     0.27723785,  0.28264967,  0.28808086,  0.29352832,
+     0.29898979,  0.30446379,  0.30994292,  0.31541664,
+     0.32087942,  0.32632772,  0.33176291,  0.33718641,
+     0.34259612,  0.34799346,  0.35338857,  0.35878843,
+     0.36419504,  0.36960630,  0.37501567,  0.38042067,
+     0.38582069,  0.39121276,  0.39659312,  0.40195993,
+     0.40731155,  0.41264382,  0.41795277,  0.42323670,
+     0.42849480,  0.43372753,  0.43893452,  0.44411398,
+     0.44927117,  0.45441882,  0.45956191,  0.46470167,
+     0.46983016,  0.47493636,  0.48001827,  0.48507480,
+     0.49010240,  0.49509781,  0.50005986,  0.50499037,
+     0.50989790,  0.51478708,  0.51965805,  0.52450975,
+     0.52933955,  0.53414668,  0.53893113,  0.54369178,
+     0.54842731,  0.55313757,  0.55782259,  0.56248253,
+     0.56711762,  0.57172819,  0.57631468,  0.58087761,
+     0.58719976,  0.59173064,  0.59623644,  0.60071719,
+     0.60517294,  0.60960372,  0.61400958,  0.61839056,
+     0.62274670,  0.62707805,  0.63138475,  0.63566700,
+     0.63992500,  0.64415895,  0.64836893,  0.65255499,
+     0.65671715,  0.66085548,  0.66497005,  0.66906094,
+     0.67312824,  0.67717199,  0.68119219,  0.68518882,
+     0.68916187,  0.69311129,  0.69703698,  0.70093884,
+     0.70481679,  0.70867071,  0.71250047,  0.71630596,
+     0.72008705,  0.72384360,  0.72757549,  0.73128256,
+     0.73496463,  0.73862141,  0.74225263,  0.74585799,
+     0.74943730,  0.75299039,  0.75651711,  0.76001729,
+     0.76349062,  0.76693670,  0.77035516,  0.77374564,
+     0.77710790,  0.78044169,  0.78374678,  0.78702291,
+     0.79026979,  0.79348715,  0.79667471,  0.79983215,
+     0.80295914,  0.80605536,  0.80912047,  0.81215417,
+     0.81515616,  0.81812616,  0.82106389,  0.82396915,
+     0.82684176,  0.82968154,  0.83248830,  0.83526186,
+     0.83800204,  0.84070866,  0.84338156,  0.84602058,
+     0.84862556,  0.85119636,  0.85373292,  0.85623523,
+     0.85870326,  0.86113701,  0.86353649,  0.86590173,
+     0.86823275,  0.87052968,  0.87279275,  0.87502220,
+     0.87721829,  0.87938130,  0.88151157,  0.88360940,
+     0.88567517,  0.88770954,  0.88971328,  0.89168716,
+     0.89363199,  0.89554856,  0.89743771,  0.89930025,
+     0.90113740,  0.90295086,  0.90474240,  0.90651380,
+     0.90826684,  0.91000335,  0.91172515,  0.91343416,
+     0.91513276,  0.91682357,  0.91850924,  0.92019170,
+     0.92187129,  0.92354778,  0.92522116,  0.92688597,
+     0.92852960,  0.93013861,  0.93169897,  0.93319114,
+     0.93458502,  0.93587626,  0.93694276,  0.93825562,
+     0.93882222,  0.93910780,  0.93944183,  0.93981497,
+     0.94021434,  0.94062629,  0.94103714,  0.94144084,
+     0.94184042,  0.94223966,  0.94264206,  0.94304859,
+     0.94345831,  0.94387033,  0.94428390,  0.94469895,
+     0.94511572,  0.94553441,  0.94595520,  0.94637816,
+     0.94680335,  0.94723080,  0.94766054,  0.94809253,
+     0.94852674,  0.94896314,  0.94940178,  0.94984276,
+     0.95028618,  0.95073213,  0.95118056,  0.95163139,
+     0.95208451,  0.95253992,  0.95299770,  0.95345799,
+     0.95392092,  0.95438653,  0.95485472,  0.95532539,
+     0.95579847,  0.95627397,  0.95675201,  0.95723273,
+     0.95771618,  0.95820232,  0.95869103,  0.95918218,
+     0.95967573,  0.96017172,  0.96067026,  0.96117144,
+     0.96167526,  0.96218157,  0.96269026,  0.96320119,
+     0.96371437,  0.96422988,  0.96474782,  0.96526824,
+     0.96579106,  0.96631614,  0.96684334,  0.96737257,
+     0.96790390,  0.96843740,  0.96897315,  0.96951112,
+     0.97005119,  0.97059318,  0.97113697,  0.97168253,
+     0.97222994,  0.97277928,  0.97333058,  0.97388375,
+     0.97443863,  0.97499505,  0.97555292,  0.97611230,
+     0.97667326,  0.97723589,  0.97780016,  0.97836591,
+     0.97893300,  0.97950127,  0.98007071,  0.98064139,
+     0.98121342,  0.98178684,  0.98236156,  0.98293743,
+     0.98351428,  0.98409205,  0.98467078,  0.98525056,
+     0.98583146,  0.98641348,  0.98699650,  0.98758037,
+     0.98816497,  0.98875030,  0.98933647,  0.98992356,
+     0.99051163,  0.99110062,  0.99169038,  0.99228079,
+     0.99287177,  0.99346341,  0.99405581,  0.99464907,
+     0.99524320,  0.99583812,  0.99643375,  0.99702997,
+     0.99762671,  0.99822386,  0.99882134,  0.99941903,
+     1.00058131,  1.00118006,  1.00177930,  1.00237893,
+     1.00297887,  1.00357902,  1.00417927,  1.00477954,
+     1.00537972,  1.00597973,  1.00657959,  1.00717940,
+     1.00777926,  1.00837925,  1.00897929,  1.00957926,
+     1.01017901,  1.01077847,  1.01137769,  1.01197678,
+     1.01257582,  1.01317482,  1.01377365,  1.01437217,
+     1.01497025,  1.01556786,  1.01616510,  1.01676205,
+     1.01735876,  1.01795514,  1.01855103,  1.01914627,
+     1.01974076,  1.02033455,  1.02092772,  1.02152037,
+     1.02211247,  1.02270387,  1.02329439,  1.02388387,
+     1.02447229,  1.02505972,  1.02564624,  1.02623190,
+     1.02681660,  1.02740017,  1.02798242,  1.02856326,
+     1.02914272,  1.02972087,  1.03029778,  1.03087344,
+     1.03144768,  1.03202035,  1.03259127,  1.03316042,
+     1.03372788,  1.03429373,  1.03485801,  1.03542064,
+     1.03598146,  1.03654030,  1.03709708,  1.03765185,
+     1.03820470,  1.03875571,  1.03930488,  1.03985206,
+     1.04039712,  1.04093989,  1.04148037,  1.04201865,
+     1.04255481,  1.04308893,  1.04362093,  1.04415068,
+     1.04467803,  1.04520292,  1.04572542,  1.04624566,
+     1.04676376,  1.04727974,  1.04779350,  1.04830493,
+     1.04881391,  1.04932048,  1.04982477,  1.05032693,
+     1.05082705,  1.05132510,  1.05182098,  1.05231457,
+     1.05280584,  1.05329485,  1.05378171,  1.05426654,
+     1.05474937,  1.05523018,  1.05570892,  1.05618554,
+     1.05666005,  1.05713251,  1.05760297,  1.05807149,
+     1.05853828,  1.05900355,  1.05946756,  1.05993024,
+     1.06039075,  1.06084806,  1.06130111,  1.06175099,
+     1.06220164,  1.06265732,  1.06312146,  1.06358726,
+     1.06403924,  1.06446186,  1.06484048,  1.06516440,
+     1.06527864,  1.06498077,  1.06470196,  1.06425743,
+     1.06372091,  1.06311464,  1.06246622,  1.06179277,
+     1.06110808,  1.06042455,  1.05974495,  1.05906206,
+     1.05836706,  1.05765243,  1.05691470,  1.05615178,
+     1.05536069,  1.05454152,  1.05370030,  1.05284445,
+     1.05198094,  1.05111433,  1.05024634,  1.04937859,
+     1.04851245,  1.04764614,  1.04677586,  1.04589855,
+     1.04501046,  1.04410500,  1.04317417,  1.04221010,
+     1.04120649,  1.04016012,  1.03906851,  1.03792894,
+     1.03674090,  1.03550649,  1.03422800,  1.03290769,
+     1.03154944,  1.03015834,  1.02873938,  1.02729712,
+     1.02583470,  1.02435463,  1.02285952,  1.02135114,
+     1.01982974,  1.01829520,  1.01674752,  1.01518534,
+     1.01360559,  1.01200510,  1.01038076,  1.00872996,
+     1.00705045,  1.00533999,  1.00359618,  1.00181613,
+     0.99999673,  0.99813477,  0.99622793,  0.99427571,
+     0.99227814,  0.99023501,  0.98815128,  0.98603857,
+     0.98390898,  0.98177413,  0.97964151,  0.97751528,
+     0.97539999,  0.97329751,  0.97119933,  0.96909179,
+     0.96696152,  0.96479824,  0.96259840,  0.96036028,
+     0.95808180,  0.95576295,  0.95340622,  0.95101436,
+     0.94859030,  0.94614009,  0.94367232,  0.94119555,
+     0.93871796,  0.93624630,  0.93378636,  0.93134465,
+     0.92892076,  0.92649974,  0.92406255,  0.92159041,
+     0.91907411,  0.91651711,  0.91392425,  0.91130056,
+     0.90865471,  0.90599838,  0.90334350,  0.90069934,
+     0.89806435,  0.89543132,  0.89279335,  0.89014496,
+     0.88748403,  0.88480945,  0.88211997,  0.87941558,
+     0.87669794,  0.87396891,  0.87123030,  0.86848394,
+     0.86573164,  0.86297523,  0.86021649,  0.85745725,
+     0.85474342,  0.85193656,  0.84911455,  0.84627969,
+     0.84343424,  0.84058046,  0.83772057,  0.83485680,
+     0.83199134,  0.82912621,  0.82626143,  0.82339529,
+     0.82052619,  0.81765147,  0.81476433,  0.81185593,
+     0.80891701,  0.80594452,  0.80294885,  0.79994431,
+     0.79694485,  0.79396166,  0.79100220,  0.78807349,
+     0.78518123,  0.78231422,  0.77944709,  0.77655407,
+     0.77361369,  0.77062281,  0.76758806,  0.76451506,
+     0.76141145,  0.75828860,  0.75515892,  0.75203479,
+     0.74892561,  0.74583682,  0.74277342,  0.73974008,
+     0.73673754,  0.73376310,  0.73081444,  0.72788616,
+     0.72496070,  0.72201426,  0.71902283,  0.71596990,
+     0.71285541,  0.70968427,  0.70646064,  0.70319589,
+     0.69991077,  0.69662714,  0.69336592,  0.69013742,
+     0.68694302,  0.68378420,  0.68066143,  0.67757157,
+     0.67450951,  0.67147030,  0.66844879,  0.66543949,
+     0.66243677,  0.65943505,  0.65642754,  0.65340591,
+     0.65036160,  0.64728630,  0.64417440,  0.64102268,
+     0.63782771,  0.63458757,  0.63130628,  0.62799109,
+     0.62464879,  0.62128816,  0.61792203,  0.61456438,
+     0.61122915,  0.60792802,  0.60466971,  0.60146257,
+     0.59831460,  0.59522876,  0.59220375,  0.58923859,
+     0.58632936,  0.58346064,  0.58061078,  0.57775874,
+     0.57488246,  0.57195790,  0.56896078,  0.56586637,
+     0.56266594,  0.55937186,  0.55599898,  0.55256299,
+     0.54909184,  0.54562376,  0.54219742,  0.53884728,
+     0.53559047,  0.53243453,  0.52938894,  0.52645052,
+     0.52358958,  0.52076862,  0.51795080,  0.51510761,
+     0.51222179,  0.50927733,  0.50625944,  0.50317073,
+     0.50002767,  0.49685021,  0.49364116,  0.49048690,
+     0.48726128,  0.48404889,  0.48090875,  0.47783482,
+     0.47481564,  0.47184024,  0.46889391,  0.46595836,
+     0.46301611,  0.46005089,  0.45705924,  0.45404822,
+     0.45102447,  0.44799543,  0.44497138,  0.44196397,
+     0.43898547,  0.43604105,  0.43312057,  0.43020942,
+     0.42729337,  0.42436272,  0.42141388,  0.41844400,
+     0.41545081,  0.41244014,  0.40942464,  0.40641716,
+     0.40342874,  0.40046292,  0.39751923,  0.39459758,
+     0.39169692,  0.38881435,  0.38594643,  0.38308980,
+     0.38024146,  0.37739896,  0.37455986,  0.37172187,
+     0.36888463,  0.36604937,  0.36321735,  0.36038967,
+     0.35756668,  0.35474832,  0.35193455,  0.34912542,
+     0.34632129,  0.34352258,  0.34072974,  0.33794323,
+     0.33516354,  0.33239114,  0.32962648,  0.32686967,
+     0.32412042,  0.32137919,  0.31864044,  0.31588373,
+     0.31309909,  0.31028631,  0.30745528,  0.30462678,
+     0.30180656,  0.29899424,  0.29619082,  0.29339717,
+     0.29061333,  0.28783935,  0.28507563,  0.28232266,
+     0.27958067,  0.27684984,  0.27413017,  0.27142157,
+     0.26872396,  0.26603737,  0.26336211,  0.26069855,
+     0.25804700,  0.25540830,  0.25278329,  0.25017211,
+     0.24757451,  0.24498713,  0.24240740,  0.23983550,
+     0.23727200,  0.23471866,  0.23217624,  0.22964458,
+     0.22712346,  0.22461258,  0.22211202,  0.21962197,
+     0.21714290,  0.21467522,  0.21221877,  0.20977323,
+     0.20733693,  0.20490860,  0.20248823,  0.20007615,
+     0.19767358,  0.19528091,  0.19289781,  0.19052347,
+     0.18815661,  0.18579693,  0.18344441,  0.18110010,
+     0.17876595,  0.17644344,  0.17413400,  0.17183905,
+     0.16956003,  0.16729836,  0.16505547,  0.16283278,
+     0.15990780,  0.15776021,  0.15563325,  0.15352557,
+     0.15143584,  0.14936270,  0.14730481,  0.14526081,
+     0.14322937,  0.14120918,  0.13919977,  0.13720138,
+     0.13521422,  0.13323852,  0.13127445,  0.12932216,
+     0.12738181,  0.12545358,  0.12353773,  0.12163457,
+     0.11974436,  0.11786730,  0.11600347,  0.11415293,
+     0.11231573,  0.11049201,  0.10868196,  0.10688578,
+     0.10510362,  0.10333551,  0.10158143,  0.09984133,
+     0.09811524,  0.09640327,  0.09470556,  0.09302228,
+     0.09135347,  0.08969907,  0.08805903,  0.08643326,
+     0.08482183,  0.08322486,  0.08164249,  0.08007481,
+     0.07852179,  0.07698335,  0.07545938,  0.07394984,
+     0.07245482,  0.07097444,  0.06950883,  0.06805800,
+     0.06662187,  0.06520031,  0.06379324,  0.06240065,
+     0.06102266,  0.05965936,  0.05831084,  0.05697701,
+     0.05565775,  0.05435290,  0.05306239,  0.05178628,
+     0.05052464,  0.04927758,  0.04804510,  0.04682709,
+     0.04562344,  0.04443405,  0.04325893,  0.04209822,
+     0.04095208,  0.03982059,  0.03870371,  0.03760131,
+     0.03651325,  0.03543944,  0.03437987,  0.03333454,
+     0.03230348,  0.03128653,  0.03028332,  0.02929346,
+     0.02831658,  0.02735252,  0.02640127,  0.02546283,
+     0.02453725,  0.02362471,  0.02272547,  0.02183980,
+     0.02096810,  0.02011108,  0.01926957,  0.01844439,
+     0.01763565,  0.01684248,  0.01606394,  0.01529909,
+     0.01454726,  0.01380802,  0.01308092,  0.01236569,
+     0.01166273,  0.01097281,  0.01029671,  0.00963479,
+     0.00898646,  0.00835089,  0.00772725,  0.00711521,
+     0.00651513,  0.00592741,  0.00535249,  0.00479089,
+     0.00424328,  0.00371041,  0.00319271,  0.00268947,
+     0.00219928,  0.00172084,  0.00125271,  0.00079311,
+     0.00034023, -0.00010786, -0.00055144, -0.00098865,
+    -0.00141741, -0.00183557, -0.00224010, -0.00262725,
+    -0.00299314, -0.00333475, -0.00365250, -0.00394867,
+    -0.00422533, -0.00448528, -0.00473278, -0.00497252,
+    -0.00520916, -0.00544584, -0.00568360, -0.00592326,
+    -0.00616547, -0.00640861, -0.00664914, -0.00688354,
+    -0.00710845, -0.00732136, -0.00752022, -0.00770289,
+    -0.00786789, -0.00801521, -0.00814526, -0.00825839,
+    -0.00835563, -0.00843882, -0.00850996, -0.00857097,
+    -0.00862360, -0.00866943, -0.00871004, -0.00874688,
+    -0.00878091, -0.00881277, -0.00884320, -0.00887248,
+    -0.00890002, -0.00892494, -0.00894641, -0.00896355,
+    -0.00897541, -0.00898104, -0.00897948, -0.00896990,
+    -0.00895149, -0.00892346, -0.00888519, -0.00883670,
+    -0.00877839, -0.00871058, -0.00863388, -0.00854936,
+    -0.00845826, -0.00836179, -0.00826124, -0.00815807,
+    -0.00805372, -0.00794953, -0.00784572, -0.00774156,
+    -0.00763634, -0.00752929, -0.00741941, -0.00730556,
+    -0.00718664, -0.00706184, -0.00693107, -0.00679443,
+    -0.00665200, -0.00650428, -0.00635230, -0.00619718,
+    -0.00603995, -0.00588133, -0.00572169, -0.00556143,
+    -0.00540085, -0.00523988, -0.00507828, -0.00491582,
+    -0.00475220, -0.00458693, -0.00441953, -0.00424950,
+    -0.00407681, -0.00390204, -0.00372581, -0.00354874,
+    -0.00337115, -0.00319318, -0.00301494, -0.00283652,
+    -0.00265797, -0.00247934, -0.00230066, -0.00212197,
+    -0.00194331, -0.00176471, -0.00158620, -0.00140787,
+    -0.00122989, -0.00105244, -0.00087567, -0.00069976,
+    -0.00052487, -0.00035115, -0.00017875, -0.00000782,
+     0.00000779,  0.00017701,  0.00034552,  0.00051313,
+     0.00067966,  0.00084492,  0.00100873,  0.00117093,
+     0.00133133,  0.00148978,  0.00164611,  0.00180023,
+     0.00195211,  0.00210172,  0.00224898,  0.00239383,
+     0.00253618,  0.00267593,  0.00281306,  0.00294756,
+     0.00307942,  0.00320864,  0.00333502,  0.00345816,
+     0.00357762,  0.00369297,  0.00380414,  0.00391140,
+     0.00401499,  0.00411524,  0.00421242,  0.00430678,
+     0.00439859,  0.00448799,  0.00457487,  0.00465908,
+     0.00474045,  0.00481857,  0.00489277,  0.00496235,
+     0.00502666,  0.00508546,  0.00513877,  0.00518662,
+     0.00522904,  0.00526648,  0.00529956,  0.00532895,
+     0.00535532,  0.00537929,  0.00540141,  0.00542228,
+     0.00544196,  0.00545981,  0.00547515,  0.00548726,
+     0.00549542,  0.00549899,  0.00549732,  0.00548986,
+     0.00547633,  0.00545664,  0.00543067,  0.00539849,
+     0.00536061,  0.00531757,  0.00526993,  0.00521822,
+     0.00516300,  0.00510485,  0.00504432,  0.00498194,
+     0.00491822,  0.00485364,  0.00478862,  0.00472309,
+     0.00465675,  0.00458939,  0.00452067,  0.00445003,
+     0.00437688,  0.00430063,  0.00422062,  0.00413609,
+     0.00404632,  0.00395060,  0.00384863,  0.00374044,
+     0.00362600,  0.00350540,  0.00337934,  0.00324885,
+     0.00311486,  0.00297849,  0.00284122,  0.00270458,
+     0.00257013,  0.00243867,  0.00231005,  0.00218399,
+     0.00206023,  0.00193766,  0.00181460,  0.00168938,
+     0.00156050,  0.00142701,  0.00128830,  0.00114365,
+     0.00099297,  0.00083752,  0.00067884,  0.00051845,
+     0.00035760,  0.00019720,  0.00003813, -0.00011885,
+    -0.00027375, -0.00042718, -0.00057975, -0.00073204,
+    -0.00088453, -0.00103767, -0.00119192, -0.00134747,
+    -0.00150411, -0.00166151, -0.00181932, -0.00197723,
+    -0.00213493, -0.00229210, -0.00244849, -0.00260415,
+    -0.00275928, -0.00291410, -0.00306879, -0.00322332,
+    -0.00337759, -0.00353145, -0.00368470, -0.00383722,
+    -0.00398892, -0.00413972, -0.00428967, -0.00443889,
+    -0.00458749, -0.00473571, -0.00488366, -0.00503137,
+    -0.00517887, -0.00532610, -0.00547302, -0.00561965,
+    -0.00576598, -0.00591199, -0.00605766, -0.00620300,
+    -0.00634801, -0.00649273, -0.00663727, -0.00678170,
+    -0.00692617, -0.00707084, -0.00721583, -0.00736129,
+    -0.00750735, -0.00765415, -0.00780184, -0.00795059,
+    -0.00810058, -0.00825195, -0.00840487, -0.00855950,
+    -0.00871607, -0.00887480, -0.00903596, -0.00919978,
+    -0.00936650, -0.00953635, -0.00970931, -0.00988421,
+    -0.01005916, -0.01023208, -0.01040130, -0.01056627,
+    -0.01072678, -0.01088259, -0.01103348, -0.01117933,
+    -0.01132004, -0.01145552, -0.01158573, -0.01171065,
+    -0.01183025, -0.01194454, -0.01205352, -0.01215722,
+    -0.01225572, -0.01234911, -0.01243749, -0.01252102,
+    -0.01259985, -0.01267419, -0.01274437, -0.01281078,
+    -0.01287379, -0.01293350, -0.01298972, -0.01304224,
+    -0.01309086, -0.01313556, -0.01317644, -0.01321357,
+    -0.01324707, -0.01327697, -0.01330334, -0.01332622,
+    -0.01334570, -0.01336194, -0.01337510, -0.01338538,
+    -0.01339276, -0.01339708, -0.01339816, -0.01339584,
+    -0.01339014, -0.01338116, -0.01336903, -0.01335382,
+    -0.01333545, -0.01331381, -0.01328876, -0.01326033,
+    -0.01322880, -0.01319457, -0.01315806, -0.01311968,
+    -0.01307987, -0.01303906, -0.01299769, -0.01295623,
+    -0.01308207, -0.01304153, -0.01299802, -0.01295155,
+    -0.01290215, -0.01284980, -0.01279450, -0.01273625,
+    -0.01267501, -0.01261077, -0.01254347, -0.01247306,
+    -0.01239950, -0.01232277, -0.01224304, -0.01216055,
+    -0.01207554, -0.01198813, -0.01189829, -0.01180590,
+    -0.01171090, -0.01161335, -0.01151352, -0.01141167,
+    -0.01130807, -0.01120289, -0.01109626, -0.01098830,
+    -0.01087916, -0.01076898, -0.01065793, -0.01054618,
+    -0.01043380, -0.01032068, -0.01020670, -0.01009171,
+    -0.00997585, -0.00985959, -0.00974338, -0.00962765,
+    -0.00951273, -0.00939888, -0.00928634, -0.00917534,
+    -0.00906604, -0.00895860, -0.00885313, -0.00874977,
+    -0.00864862, -0.00854979, -0.00845337, -0.00835939,
+    -0.00826785, -0.00817872, -0.00809195, -0.00800745,
+    -0.00792506, -0.00784469, -0.00776588, -0.00768695,
+    -0.00760568, -0.00752004, -0.00742875, -0.00733186,
+    -0.00722976, -0.00712279, -0.00701130, -0.00689559,
+    -0.00677595, -0.00665269, -0.00652610, -0.00639649,
+    -0.00626417, -0.00612943, -0.00599252, -0.00585368,
+    -0.00571315, -0.00557115, -0.00542792, -0.00528367,
+    -0.00513864, -0.00499301, -0.00484693, -0.00470054,
+    -0.00455395, -0.00440733, -0.00426086, -0.00411471,
+    -0.00396904, -0.00382404, -0.00367991, -0.00353684,
+    -0.00339502, -0.00325472, -0.00311618, -0.00297967,
+    -0.00284531, -0.00271307, -0.00258290, -0.00245475,
+    -0.00232860, -0.00220447, -0.00208236, -0.00196233,
+    -0.00184450, -0.00172906, -0.00161620, -0.00150603,
+    -0.00139852, -0.00129358, -0.00119112, -0.00109115,
+    -0.00099375, -0.00089902, -0.00080705, -0.00071796,
+    -0.00063185, -0.00054886, -0.00046904, -0.00039231,
+    -0.00031845, -0.00024728, -0.00017860, -0.00011216,
+    -0.00004771,  0.00001500,  0.00007600,  0.00013501,
+     0.00019176,  0.00024595,  0.00029720,  0.00034504,
+     0.00038902,  0.00042881,  0.00046456,  0.00049662,
+     0.00052534,  0.00055114,  0.00057459,  0.00059629,
+     0.00061684,  0.00063660,  0.00065568,  0.00067417,
+     0.00069213,  0.00070935,  0.00072545,  0.00074005,
+     0.00075283,  0.00076356,  0.00077209,  0.00077828,
+     0.00078205,  0.00078350,  0.00078275,  0.00077992,
+     0.00077520,  0.00076884,  0.00076108,  0.00075218,
+     0.00074232,  0.00073170,  0.00072048,  0.00070881,
+     0.00069680,  0.00068450,  0.00067201,  0.00065934,
+     0.00064647,  0.00063335,  0.00061994,  0.00060621,
+     0.00059211,  0.00057763,  0.00056274,  0.00054743,
+     0.00053169,  0.00051553,  0.00049897,  0.00048206,
+     0.00046487,  0.00044748,  0.00042996,  0.00041241,
+     0.00039492,  0.00037759,  0.00036049,  0.00034371,
+     0.00032732,  0.00031137,  0.00029587,  0.00028079,
+     0.00026612,  0.00025183,  0.00023789,  0.00022428,
+     0.00021097,  0.00019797,  0.00018530,  0.00017297,
+     0.00016100,  0.00014942,  0.00013827,  0.00012757,
+     0.00011736,  0.00010764,  0.00009841,  0.00008969,
+     0.00008145,  0.00007369,  0.00006641,  0.00005958,
+     0.00005320,  0.00004725,  0.00004171,  0.00003659,
+     0.00003186,  0.00002752,  0.00002357,  0.00001999,
+     0.00001679,  0.00001392,  0.00001140,  0.00000918,
+     0.00000726,  0.00000562,  0.00000424,  0.00000309,
+     0.00000217,  0.00000143,  0.00000088,  0.00000048,
+     0.00000020,  0.00000004, -0.00000004, -0.00000006,
+    -0.00000004, -0.00000000,  0.00000002,  0.00000000,
+     0.00000000,  0.00000002, -0.00000000, -0.00000004,
+    -0.00000005, -0.00000004,  0.00000004,  0.00000019,
+     0.00000045,  0.00000083,  0.00000134,  0.00000201,
+     0.00000285,  0.00000387,  0.00000510,  0.00000654,
+     0.00000821,  0.00001011,  0.00001227,  0.00001468,
+     0.00001735,  0.00002030,  0.00002352,  0.00002702,
+     0.00003080,  0.00003486,  0.00003918,  0.00004379,
+     0.00004866,  0.00005382,  0.00005924,  0.00006495,
+     0.00007093,  0.00007719,  0.00008373,  0.00009053,
+     0.00009758,  0.00010488,  0.00011240,  0.00012010,
+     0.00012796,  0.00013596,  0.00014406,  0.00015226,
+     0.00016053,  0.00016886,  0.00017725,  0.00018571,
+     0.00019424,  0.00020286,  0.00021156,  0.00022037,
+     0.00022928,  0.00023825,  0.00024724,  0.00025621,
+     0.00026509,  0.00027385,  0.00028241,  0.00029072,
+     0.00029874,  0.00030643,  0.00031374,  0.00032065,
+     0.00032715,  0.00033325,  0.00033895,  0.00034425,
+     0.00034917,  0.00035374,  0.00035796,  0.00036187,
+     0.00036549,  0.00036883,  0.00037194,  0.00037479,
+     0.00037736,  0.00037963,  0.00038154,  0.00038306,
+     0.00038411,  0.00038462,  0.00038453,  0.00038373,
+     0.00038213,  0.00037965,  0.00037621,  0.00037179,
+     0.00036636,  0.00035989,  0.00035244,  0.00034407,
+     0.00033488,  0.00032497,  0.00031449,  0.00030361,
+     0.00029252,  0.00028133,  0.00027003,  0.00025862,
+     0.00024706,  0.00023524,  0.00022297,  0.00021004,
+     0.00019626,  0.00018150,  0.00016566,  0.00014864,
+     0.00013041,  0.00011112,  0.00009096,  0.00007014,
+     0.00004884,  0.00002718,  0.00000530, -0.00001667,
+    -0.00003871, -0.00006090, -0.00008331, -0.00010600,
+    -0.00012902, -0.00015244, -0.00017631, -0.00020065,
+    -0.00022541, -0.00025052, -0.00027594, -0.00030159,
+    -0.00032740, -0.00035332, -0.00037928, -0.00040527,
+    -0.00043131, -0.00045741, -0.00048357, -0.00050978,
+    -0.00053599, -0.00056217, -0.00058827, -0.00061423,
+    -0.00064002, -0.00066562, -0.00069100, -0.00071616,
+    -0.00074110, -0.00076584, -0.00079036, -0.00081465,
+    -0.00083869, -0.00086245, -0.00088590, -0.00090901,
+    -0.00093176, -0.00095413, -0.00097608, -0.00099758,
+    -0.00101862, -0.00103918, -0.00105924, -0.00107879,
+    -0.00109783, -0.00111635, -0.00113434, -0.00115181,
+    -0.00116873, -0.00118510, -0.00120091, -0.00121615,
+    -0.00123082, -0.00124490, -0.00125838, -0.00127125,
+    -0.00128350, -0.00129511, -0.00130610, -0.00131643,
+    -0.00132610, -0.00133509, -0.00134334, -0.00135069,
+    -0.00135711, -0.00136272, -0.00136768, -0.00137225,
+    -0.00137649, -0.00138042, -0.00138404, -0.00138737,
+    -0.00139041, -0.00139317, -0.00139565, -0.00139785,
+    -0.00139976, -0.00140137, -0.00140267, -0.00140366,
+    -0.00140432, -0.00140464, -0.00140461, -0.00140423,
+    -0.00140347, -0.00140235, -0.00140084, -0.00139894,
+    -0.00139664, -0.00139388, -0.00139065, -0.00138694,
+    -0.00138278, -0.00137818, -0.00137317, -0.00136772,
+    -0.00136185, -0.00135556, -0.00134884, -0.00134170,
+    -0.00133415, -0.00132619, -0.00131784, -0.00130908,
+    -0.00129991, -0.00129031, -0.00128031, -0.00126990,
+    -0.00125912, -0.00124797, -0.00123645, -0.00122458,
+    -0.00121233, -0.00119972, -0.00118676, -0.00117347,
+    -0.00115988, -0.00114605, -0.00113200, -0.00111778,
+    -0.00110343, -0.00108898, -0.00107448, -0.00105995,
+};
diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h
index d19b3fd..fc26db8 100644
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@@ -46,7 +46,8 @@
  */
 DECLARE_ALIGNED(32, extern float,  ff_aac_kbd_long_1024)[1024];
 DECLARE_ALIGNED(32, extern float,  ff_aac_kbd_short_128)[128];
-const DECLARE_ALIGNED(32, extern float, ff_aac_eld_window)[1920];
+const DECLARE_ALIGNED(32, extern float, ff_aac_eld_window_512)[1920];
+const DECLARE_ALIGNED(32, extern float, ff_aac_eld_window_480)[1800];
 // @}
 
 /* @name number of scalefactor window bands for long and short transform windows respectively
@@ -54,6 +55,7 @@ const DECLARE_ALIGNED(32, extern float, ff_aac_eld_window)[1920];
  */
 extern const uint8_t ff_aac_num_swb_1024[];
 extern const uint8_t ff_aac_num_swb_512 [];
+extern const uint8_t ff_aac_num_swb_480 [];
 extern const uint8_t ff_aac_num_swb_128 [];
 // @}
 
@@ -72,10 +74,12 @@ 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_512 [13];
+extern const uint16_t * const ff_swb_offset_480 [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_512 [13];
+extern const uint8_t ff_tns_max_bands_480 [13];
 extern const uint8_t ff_tns_max_bands_128 [13];
 
 #endif /* AVCODEC_AACTAB_H */



More information about the ffmpeg-cvslog mailing list