[FFmpeg-soc] [soc]: r4339 - wmapro/wma3dec.c

[faust3]

Author: faust3
Date: Sat May 30 16:26:18 2009
New Revision: 4339

Log:
calculate decorrelation_matrix in wma_decode_channel_transform

Modified:
   wmapro/wma3dec.c

Modified: wmapro/wma3dec.c
==============================================================================
--- wmapro/wma3dec.c	Sat May 30 16:00:19 2009	(r4338)
+++ wmapro/wma3dec.c	Sat May 30 16:26:18 2009	(r4339)
@@ -611,6 +611,7 @@ static int wma_decode_tilehdr(WMA3Decode
     return 0;
 }
 
+static void wma_calc_decorrelation_matrix(WMA3ChannelGroup* chgroup);
 /**
  *@brief Decode channel transformation parameters
  *@param s codec context
@@ -733,6 +734,7 @@ static int wma_decode_channel_transform(
                 }
                 for(i=0;i<chgroup->num_channels;i++)
                     chgroup->decorrelation_matrix[chgroup->num_channels * i + i] = get_bits1(&s->gb)?1.0:-1.0;
+                wma_calc_decorrelation_matrix(chgroup);
             }
 
             /** decode transform on / off */
@@ -1082,8 +1084,6 @@ static void wma_inverse_channel_transfor
             float  sums[MAX_CHANNELS * MAX_CHANNELS];
 
             /** multichannel decorrelation */
-            if(!s->chgroup[i].no_rotation)
-                wma_calc_decorrelation_matrix(&s->chgroup[i]);
 
             /** get the channels that use the transform */
             for(x=0;x<s->channels_for_cur_subframe;x++){