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

[faust3]

Author: faust3
Date: Sat Jan 17 18:32:06 2009
New Revision: 3980

Log:
renamed wma_channel_group to WMA3ChannelGroup

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

Modified: wmapro/wma3.h
==============================================================================
--- wmapro/wma3.h	Sat Jan 17 18:29:29 2009	(r3979)
+++ wmapro/wma3.h	Sat Jan 17 18:32:06 2009	(r3980)
@@ -78,7 +78,7 @@ 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;
+} WMA3ChannelGroup;
 
 /**
  *@brief main decoder context
@@ -148,8 +148,8 @@ typedef struct WMA3DecodeContext {
     int              quant_step;
     int              esc_len;
 
-    int              nb_chgroups;              //< number of channel groups
-    wma_channel_group chgroup[MAX_CHANNELS];   //< channel group information
+    uint8_t          nb_chgroups;              //< number of channel groups
+    WMA3ChannelGroup chgroup[MAX_CHANNELS];    //< channel group information
 
     WMA3ChannelCtx   channel[MAX_CHANNELS];    //< per channel data
 } WMA3DecodeContext;

Modified: wmapro/wma3dec.c
==============================================================================
--- wmapro/wma3dec.c	Sat Jan 17 18:29:29 2009	(r3979)
+++ wmapro/wma3dec.c	Sat Jan 17 18:32:06 2009	(r3980)
@@ -590,7 +590,7 @@ static int wma_decode_channel_transform(
         }
 
         for(s->nb_chgroups = 0; remaining_channels && s->nb_chgroups < s->channels_for_cur_subframe;s->nb_chgroups++){
-            wma_channel_group* chgroup = &s->chgroup[s->nb_chgroups];
+            WMA3ChannelGroup* chgroup = &s->chgroup[s->nb_chgroups];
             chgroup->nb_channels = 0;
             chgroup->no_rotation = 0;
             chgroup->transform = 0;
@@ -939,7 +939,7 @@ static int wma_decode_scale_factors(WMA3
     return 1;
 }
 
-static void wma_calc_decorrelation_matrix(WMA3DecodeContext *s, wma_channel_group* chgroup)
+static void wma_calc_decorrelation_matrix(WMA3DecodeContext *s, WMA3ChannelGroup* chgroup)
 {
     int i;
     int offset = 0;