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

faust3 subversion at mplayerhq.hu
Sat May 30 16:41:30 CEST 2009


Author: faust3
Date: Sat May 30 16:41:30 2009
New Revision: 4341

Log:
simplified the 1 channel case in wma_decode_channel_transform

Modified:
   wmapro/wma3dec.c

Modified: wmapro/wma3dec.c
==============================================================================
--- wmapro/wma3dec.c	Sat May 30 16:30:00 2009	(r4340)
+++ wmapro/wma3dec.c	Sat May 30 16:41:30 2009	(r4341)
@@ -660,18 +660,8 @@ static int wma_decode_channel_transform(
     }
 
     /** in the one channel case channel transforms are pointless */
-    if(s->num_channels == 1 ){
-        s->num_chgroups = 0;
-        s->chgroup[0].num_channels = 1;
-        s->chgroup[0].no_rotation = 1;
-        s->chgroup[0].transform = 2;
-        s->channel[0].resampled_scale_factors[0] = 0;
-        memset(s->chgroup[0].transform_band,0,MAX_BANDS);
-        memset(s->chgroup[0].decorrelation_matrix,0,sizeof(float) *s->num_channels * s->num_channels);
-
-        s->chgroup[0].decorrelation_matrix[0] = 1.0;
-
-    }else{
+    s->num_chgroups = 0;
+    if(s->num_channels > 1){
         int remaining_channels = s->channels_for_cur_subframe;
 
         if(get_bits1(&s->gb)){


More information about the FFmpeg-soc mailing list