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

[faust3]

Author: faust3
Date: Sat Jan 17 14:29:53 2009
New Revision: 3972

Log:
renamed ff_wma3_level/run_i to ff_wma3_coeffi_level/run and exchanged the indices so that they match the read bit

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

Modified: wmapro/wma3data.h
==============================================================================
--- wmapro/wma3data.h	Sat Jan 17 14:19:07 2009	(r3971)
+++ wmapro/wma3data.h	Sat Jan 17 14:29:53 2009	(r3972)
@@ -458,7 +458,7 @@ static const uint8_t ff_wma3_symbol_to_v
 };
 
 
-static const uint8_t ff_wma3_run_0[] = {
+static const uint8_t ff_wma3_coeff1_run[] = {
      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, 31, 32, 33, 34, 35,
     36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
@@ -476,7 +476,7 @@ static const uint8_t ff_wma3_run_0[] = {
      0,  0,  0,  0,
 };
 
-static const uint8_t ff_wma3_level_0[] = {
+static const uint8_t ff_wma3_coeff1_level[] = {
      1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
      1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
      1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
@@ -495,7 +495,7 @@ static const uint8_t ff_wma3_level_0[] =
 };
 
 
-static const uint8_t ff_wma3_run_1[] = {
+static const uint8_t ff_wma3_coeff0_run[] = {
       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,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,
@@ -518,7 +518,7 @@ static const uint8_t ff_wma3_run_1[] = {
       1,   0,   1,   0,   0,   0,
 };
 
-static const uint8_t ff_wma3_level_1[] = {
+static const uint8_t ff_wma3_coeff0_level[] = {
       1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
       1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
       1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,

Modified: wmapro/wma3dec.c
==============================================================================
--- wmapro/wma3dec.c	Sat Jan 17 14:19:07 2009	(r3971)
+++ wmapro/wma3dec.c	Sat Jan 17 14:29:53 2009	(r3972)
@@ -785,12 +785,12 @@ static int decode_coeffs(WMA3DecodeConte
     vlc = &s->coef_vlc[vlctable];
     vlcmax = s->coef_max[vlctable];
 
-    if(!vlctable){
-        run =  ff_wma3_run_1;
-        level =  ff_wma3_level_1;
+    if(vlctable){
+        run =  ff_wma3_coeff1_run;
+        level =  ff_wma3_coeff1_level;
     }else{
-        run =  ff_wma3_run_0;
-        level =  ff_wma3_level_0;
+        run =  ff_wma3_coeff0_run;
+        level =  ff_wma3_coeff0_level;
     }
 
     while(cur_coeff < s->subframe_len){