[FFmpeg-soc] [soc]: r3966 - in wmapro: wma3data.h wma3dec.c

[faust3]

Author: faust3
Date: Sat Jan 17 13:06:51 2009
New Revision: 3966

Log:
renamed vector lookup tables

Modified:
   wmapro/wma3data.h
   wmapro/wma3dec.c

Modified: wmapro/wma3data.h
==============================================================================
--- wmapro/wma3data.h	Sat Jan 17 13:03:20 2009	(r3965)
+++ wmapro/wma3data.h	Sat Jan 17 13:06:51 2009	(r3966)
@@ -360,7 +360,7 @@ static const uint8_t ff_wma3_vec1_huffbi
 };
 
 
-static const uint16_t ff_wma3_sym2vec4[] = {
+static const uint16_t ff_wma3_symbol_to_vec4[] = {
         0,    1,      2,     3,     4,     5,    16,    17,    18,    19,
        20,   32,     33,    34,    35,    48,    49,    50,    64,    65,
        80,   256,   257,   258,   259,   260,   272,   273,   274,   275,
@@ -377,7 +377,7 @@ static const uint16_t ff_wma3_sym2vec4[]
 };
 
 
-static const uint8_t ff_wma3_sym2vec2[] = {
+static const uint8_t ff_wma3_symbol_to_vec2[] = {
       0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
      15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
      30,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,

Modified: wmapro/wma3dec.c
==============================================================================
--- wmapro/wma3dec.c	Sat Jan 17 13:03:20 2009	(r3965)
+++ wmapro/wma3dec.c	Sat Jan 17 13:06:51 2009	(r3966)
@@ -740,18 +740,18 @@ static inline void wma_get_vec4(WMA3Deco
                    if(vals[i+1] == 100)
                        vals[i+1] += wma_get_large_val(s);
               }else{
-                  vals[i] = (ff_wma3_sym2vec2[idx] >> 4) & 0xF;
-                  vals[i+1] = ff_wma3_sym2vec2[idx] & 0xF;
+                  vals[i] = (ff_wma3_symbol_to_vec2[idx] >> 4) & 0xF;
+                  vals[i+1] = ff_wma3_symbol_to_vec2[idx] & 0xF;
               }
               i += 2;
           }
         }
         else
         {
-          vals[0] = (unsigned char)(ff_wma3_sym2vec4[idx] >> 8) >> 4;
-          vals[1] = (ff_wma3_sym2vec4[idx] >> 8) & 0xF;
-          vals[2] = (ff_wma3_sym2vec4[idx] >> 4) & 0xF;
-          vals[3] = ff_wma3_sym2vec4[idx] & 0xF;
+          vals[0] = (unsigned char)(ff_wma3_symbol_to_vec4[idx] >> 8) >> 4;
+          vals[1] = (ff_wma3_symbol_to_vec4[idx] >> 8) & 0xF;
+          vals[2] = (ff_wma3_symbol_to_vec4[idx] >> 4) & 0xF;
+          vals[3] = ff_wma3_symbol_to_vec4[idx] & 0xF;
         }
 
         if(vals[0])