[FFmpeg-soc] [soc]: r3194 - in aac: aac.c aac.h

[superdump]

Author: superdump
Date: Tue Aug 12 16:07:53 2008
New Revision: 3194

Log:
Remove intensity_present as it is unnecessary


Modified:
   aac/aac.c
   aac/aac.h

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Tue Aug 12 16:07:53 2008
@@ -680,7 +680,6 @@ static int decode_scalefactors(AACContex
     int offset[3] = { global_gain, global_gain - 90, 100 };
     int noise_flag = 1;
     static const char *sf_str[3] = { "Global gain", "Noise gain", "Intensity stereo position" };
-    ics->intensity_present = 0;
     for (g = 0; g < ics->num_window_groups; g++) {
         for (i = 0; i < ics->max_sfb;) {
             int run_end = band_type_run_end[idx];
@@ -688,7 +687,6 @@ static int decode_scalefactors(AACContex
                 for(; i < run_end; i++, idx++)
                     sf[idx] = 0.;
             }else if((band_type[idx] == INTENSITY_BT) || (band_type[idx] == INTENSITY_BT2)) {
-                ics->intensity_present = 1;
                 for(; i < run_end; i++, idx++) {
                     offset[2] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
                     if(offset[2] > 255U) {
@@ -1121,7 +1119,6 @@ static int decode_cpe(AACContext * ac, G
     if (common_window && ms_present)
         apply_mid_side_stereo(cpe);
 
-    if (cpe->ch[1].ics.intensity_present)
         apply_intensity_stereo(cpe, ms_present);
     return 0;
 }

Modified: aac/aac.h
==============================================================================
--- aac/aac.h	(original)
+++ aac/aac.h	Tue Aug 12 16:07:53 2008
@@ -166,7 +166,6 @@ typedef struct {
  * Individual Channel Stream
  */
 typedef struct {
-    int intensity_present;
     uint8_t max_sfb;            ///< number of scalefactor bands per group
     enum WindowSequence window_sequence[2];
     uint8_t use_kb_window[2];   ///< If set, use Kaiser-Bessel window, otherwise use a sinus window.