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

superdump subversion at mplayerhq.hu
Thu Aug 7 15:08:54 CEST 2008


Author: superdump
Date: Thu Aug  7 15:08:54 2008
New Revision: 3065

Log:
Remove additional_excluded_chns[] array from DRC as it will be unused even when
DRC is fully implemented


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

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Thu Aug  7 15:08:54 2008
@@ -1279,7 +1279,7 @@ static int decode_drc_channel_exclusions
             che_drc->exclude_mask[num_excl_chan + i] = get_bits1(gb);
         n++;
         num_excl_chan += 7;
-    } while (num_excl_chan < MAX_CHANNELS - 7 && (che_drc->additional_excluded_chns[n-1] = get_bits1(gb)));
+    } while (num_excl_chan < MAX_CHANNELS - 7 && get_bits1(gb));
 
     return n;
 }

Modified: aac/aac.h
==============================================================================
--- aac/aac.h	(original)
+++ aac/aac.h	Thu Aug  7 15:08:54 2008
@@ -222,9 +222,6 @@ typedef struct {
     int dyn_rng_sgn[17];                            ///< DRC sign information; 0 - positive, 1 - negative
     int dyn_rng_ctl[17];                            ///< DRC magnitude information
     int exclude_mask[MAX_CHANNELS];                 ///< Channels to be excluded from DRC processing.
-    int additional_excluded_chns[MAX_CHANNELS / 7]; /**< The exclude_mask bits are
-                                                        coded in groups of 7 with 1 bit preceeding each group (except the first)
-                                                        indicating that 7 more mask bits are coded. */
     int band_incr;                                  ///< Number of DRC bands greater than 1 having DRC info.
     int interpolation_scheme;                       ///< Indicates the interpolation scheme used in the SBR QMF domain.
     int band_top[17];                               ///< Indicates the top of the i-th DRC band in units of 4 spectral lines.



More information about the FFmpeg-soc mailing list