Last table renaming

Originally committed as revision 13828 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c
index 6448017..3b85503 100644 (file)
--- a/libavcodec/ra144.c
+++ b/libavcodec/ra144.c
@@ -224,15 +224,15 @@ static void do_output_subblock(RA144Context *ractx,
         m[0] = 0;
     }
 
-    m[1] = ((ftable1[cb1_idx] >> 4) * gval) >> 8;
-    m[2] = ((ftable2[cb2_idx] >> 4) * gval) >> 8;
+    m[1] = ((cb1_base[cb1_idx] >> 4) * gval) >> 8;
+    m[2] = ((cb2_base[cb2_idx] >> 4) * gval) >> 8;
 
     memmove(ractx->adapt_cb, ractx->adapt_cb + BLOCKSIZE,
             (BUFFERSIZE - BLOCKSIZE) * 2);
 
     block = ractx->adapt_cb + BUFFERSIZE - BLOCKSIZE;
 
-    add_wav(gain, cba_idx, m, buffer_a, etable1[cb1_idx], etable2[cb2_idx],
+    add_wav(gain, cba_idx, m, buffer_a, cb1_vects[cb1_idx], cb2_vects[cb2_idx],
             block);
 
     lpc_filter(lpc_coefs, block, output_buffer, ractx->buffer, BLOCKSIZE);

diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h
index 54605ba..1947aa6 100644 (file)
--- a/libavcodec/ra144.h
+++ b/libavcodec/ra144.h
@@ -543,7 +543,7 @@ static const uint8_t gain_exp_tab[256][9] = {
     { 8, 11, 10, 10, 10, 13,  8, 14, 13}
 };
 
-static const int8_t etable1[128][40]={
+static const int8_t cb1_vects[128][40]={
     {
      38,  -4,  15,  -4,  14, -13,  12, -11,  -2,  -6,
      -6, -11, -45, -16, -11, -13,  -7,   6, -12,   4,
@@ -1187,7 +1187,7 @@ static const int8_t etable1[128][40]={
     }
 };
 
-static const int8_t etable2[128][40]={
+static const int8_t cb2_vects[128][40]={
     {
      73, -32, -60, -15, -26,  59,   2, -33,  30, -10,
      -3, -17,   8,  30,  -1, -26,  -4, -22,  10,  16,
@@ -1831,7 +1831,7 @@ static const int8_t etable2[128][40]={
     }
 };
 
-static const uint32_t ftable1[128]={
+static const uint32_t cb1_base[128]={
     314527,  295599,  293848,  280320,  336779,  291703,  297354,  266749,
     325815,  305109,  310555,  294891,  349515,  300052,  313812,  278588,
     326231,  348357,  322076,  347246,  335655,  327567,  314037,  310198,
@@ -1850,7 +1850,7 @@ static const uint32_t ftable1[128]={
     266749,  297354,  291703,  336779,  280320,  293848,  295599,  314527
 };
 
-static const uint32_t ftable2[128]={
+static const uint32_t cb2_base[128]={
     194793,  214093,  222075,  221325,  210734,  211641,  211270,  192855,
     198561,  223821,  229577,  234105,  209600,  214643,  211594,  196292,
     191722,  221201,  215984,  227369,  222035,  236618,  220978,  209746,