[FFmpeg-cvslog] r13825 - in trunk/libavcodec: ra144.c ra144.h

[vitor]

Author: vitor
Date: Thu Jun 19 22:31:34 2008
New Revision: 13825

Log:
More table renaming

Modified:
   trunk/libavcodec/ra144.c
   trunk/libavcodec/ra144.h

Modified: trunk/libavcodec/ra144.c
==============================================================================
--- trunk/libavcodec/ra144.c	(original)
+++ trunk/libavcodec/ra144.c	Thu Jun 19 22:31:34 2008
@@ -351,7 +351,7 @@ static int ra144_decode_frame(AVCodecCon
 
     for (i=0; i<10; i++)
         // "<< 1"? Doesn't this make one value out of two of the table useless?
-        lpc_refl[i] = decodetable[i][get_bits(&gb, sizes[i]) << 1];
+        lpc_refl[i] = lpc_refl_cb[i][get_bits(&gb, sizes[i]) << 1];
 
     eval_coefs(lpc_refl, ractx->lpc_coef);
     ractx->lpc_refl_rms = rms(lpc_refl);

Modified: trunk/libavcodec/ra144.h
==============================================================================
--- trunk/libavcodec/ra144.h	(original)
+++ trunk/libavcodec/ra144.h	Thu Jun 19 22:31:34 2008
@@ -1880,7 +1880,7 @@ static const int16_t energy_tab[63]={
      8192,  9191, 10313, 11571, 12983, 14567, 16345
 };
 
-static const int16_t decodetable1[127]={
+static const int16_t lpc_refl_cb1[127]={
     -4041, -4029, -4018, -4008, -3998, -3988, -3977, -3966,
     -3954, -3942, -3930, -3918, -3906, -3892, -3879, -3866,
     -3852, -3839, -3825, -3810, -3795, -3779, -3764, -3748,
@@ -1899,7 +1899,7 @@ static const int16_t decodetable1[127]={
      3118,  3240,  3363,  3475,  3588,  3701,  3814
 };
 
-static const int16_t decodetable2[63]={
+static const int16_t lpc_refl_cb2[63]={
     -3091, -2739, -2386, -2129, -1871, -1648, -1425, -1223,
     -1021,  -835,  -649,  -483,  -316,  -168,   -20,   123,
       267,   406,   544,   677,   810,   937,  1065,  1185,
@@ -1910,7 +1910,7 @@ static const int16_t decodetable2[63]={
      3789,  3829,  3870,  3908,  3947,  3983,  4020
 };
 
-static const int16_t decodetable3[63]={
+static const int16_t lpc_refl_cb3[63]={
     -3525, -3410, -3295, -3188, -3081, -2985, -2890, -2793,
     -2696, -2603, -2511, -2419, -2328, -2238, -2149, -2064,
     -1979, -1898, -1817, -1737, -1658, -1578, -1498, -1420,
@@ -1921,47 +1921,47 @@ static const int16_t decodetable3[63]={
      1651,  1808,  1965,  2162,  2360,  2607,  2854
 };
 
-static const int16_t decodetable4[31]={
+static const int16_t lpc_refl_cb4[31]={
     -1845, -1451, -1057,  -790,  -522,  -300,   -77,   111,
       301,   474,   647,   811,   975,  1130,  1285,  1434,
      1582,  1727,  1873,  2018,  2163,  2308,  2452,  2594,
      2735,  2876,  3017,  3158,  3299,  3434,  3569
 };
 
-static const int16_t decodetable5[31]={
+static const int16_t lpc_refl_cb5[31]={
     -2691, -2439, -2187, -1987, -1788, -1611, -1435, -1276,
     -1118,  -977,  -837,  -704,  -571,  -444,  -316,  -188,
       -59,    71,   201,   336,   470,   614,   759,   918,
      1077,  1267,  1457,  1682,  1908,  2201,  2495
 };
 
-static const int16_t decodetable6[15]={
+static const int16_t lpc_refl_cb6[15]={
     -1372,  -923,  -474,  -170,   133,   383,   632,   866,
      1100,  1335,  1571,  1823,  2075,  2374,  2672
 };
 
-static const int16_t decodetable7[15]={
+static const int16_t lpc_refl_cb7[15]={
     -2389, -2088, -1787, -1509, -1231,  -974,  -717,  -478,
      -239,    -2,   234,   502,   770,  1122,  1474
 };
 
-static const int16_t decodetable8[15]={
+static const int16_t lpc_refl_cb8[15]={
     -1569, -1217,  -864,  -580,  -296,   -47,   200,   435,
       670,   911,  1151,  1430,  1709,  2047,  2385
 };
 
-static const int16_t decodetable9[15]={
+static const int16_t lpc_refl_cb9[15]={
     -2200, -1904, -1608, -1335, -1062,  -816,  -569,  -344,
      -120,   108,   338,   600,   863,  1242,  1621
 };
 
-static const int16_t decodetable10[7]={
+static const int16_t lpc_refl_cb10[7]={
      -617,  -213,   190,   496,   802,  1142,  1483
 };
 
-static const int16_t *decodetable[10]={
-    decodetable1,decodetable2,decodetable3,decodetable4,decodetable5,
-    decodetable6,decodetable7,decodetable8,decodetable9,decodetable10
+static const int16_t *lpc_refl_cb[10]={
+    lpc_refl_cb1, lpc_refl_ cb2,lpc_refl_cb3, lpc_refl_cb4, lpc_refl_cb5,
+    lpc_refl_cb6, lpc_refl_cb7, lpc_refl_cb8, lpc_refl_cb9, lpc_refl_cb10
 };
 
 #endif /* FFMPEG_RA144_H */