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

[faust3]

Author: faust3
Date: Sun Jan 11 11:55:23 2009
New Revision: 3944

Log:
a few cosmetic fixes and FIXMEs by Benjamin Larsson

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

Modified: wmapro/wma3.h
==============================================================================
--- wmapro/wma3.h	Sun Jan 11 11:42:29 2009	(r3943)
+++ wmapro/wma3.h	Sun Jan 11 11:55:23 2009	(r3944)
@@ -64,8 +64,8 @@ typedef struct {
     int transmit_sf;
     int scale_factor_step;
     int quant_step_modifier;
-    int    max_scale_factor;
-    int   scale_factor_block_len; //< block len of the frame for which the scale factors were transmitted
+    int max_scale_factor;
+    int scale_factor_block_len; //< block len of the frame for which the scale factors were transmitted
     DECLARE_ALIGNED_16(float, out[8192]);
 
 } wma_channel;
@@ -79,7 +79,6 @@ typedef struct {
     char positive[MAX_CHANNELS * MAX_CHANNELS]; //< fixme for what are these numbers used?
     float decorrelation_matrix[MAX_CHANNELS*MAX_CHANNELS];
     char use_channel[MAX_CHANNELS];
-
 } wma_channel_group;
 
 /**

Modified: wmapro/wma3data.h
==============================================================================
--- wmapro/wma3data.h	Sun Jan 11 11:42:29 2009	(r3943)
+++ wmapro/wma3data.h	Sun Jan 11 11:55:23 2009	(r3944)
@@ -383,10 +383,6 @@ static const uint8_t ff_wma3_huff_rlc_bi
 
 };
 
-
-
-
-
 static const short ff_wma3_run_0[] = {
 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,

Modified: wmapro/wma3dec.c
==============================================================================
--- wmapro/wma3dec.c	Sun Jan 11 11:42:29 2009	(r3943)
+++ wmapro/wma3dec.c	Sun Jan 11 11:55:23 2009	(r3944)
@@ -138,7 +138,6 @@ static av_cold int wma3_decode_init(AVCo
     int i;
 
     s->avctx = avctx;
-
     dsputil_init(&s->dsp, avctx);
 
     /* FIXME is this really the right thing todo for 24 bit? */
@@ -640,7 +639,7 @@ static int wma_decode_channel_transform(
                 }else{
                     chgroup->no_rotation = 1;
                     chgroup->transform = 1;
-                    chgroup->decorrelation_matrix[0] = 0.70703125;
+                    chgroup->decorrelation_matrix[0] = 0.70703125;  //FIXME cos(pi/4)
                     chgroup->decorrelation_matrix[1] = -0.70703125;
                     chgroup->decorrelation_matrix[2] = 0.70703125;
                     chgroup->decorrelation_matrix[3] = 0.70703125;
@@ -710,7 +709,6 @@ static int wma_decode_channel_transform(
 }
 
 
-
 static unsigned int wma_get_large_val(WMA3DecodeContext* s)
 {
     int n_bits = 8;
@@ -933,9 +931,7 @@ static int wma_decode_scale_factors(WMA3
                         return 0;
                     }else
                         s->channel[c].scale_factors[i] += (val ^ level_mask) - val;
-
                 }
-
             }
 
             s->channel[c].reuse_sf = 1;
@@ -971,7 +967,7 @@ static void wma_calc_decorrelation_matri
                     float v1 = tmp1[y];
                     float v2 = tmp2[y];
                     int n = chgroup->rotation_offset[offset + x];
-                    float cosv = sin(n*M_PI / 64.0);
+                    float cosv = sin(n*M_PI / 64.0);                //FIXME use one table for this
                     float sinv = -cos(n*M_PI / 64.0);
 
                     chgroup->decorrelation_matrix[y + x * chgroup->nb_channels] = (v1 * cosv) + (v2 * sinv);