[FFmpeg-soc] [soc]: r3083 - in aac: aac.c aacdectab.h

[superdump]

Author: superdump
Date: Fri Aug  8 14:45:16 2008
New Revision: 3083

Log:
Update comments to reflect the removal of ProgramConfig


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

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Fri Aug  8 14:45:16 2008
@@ -158,10 +158,11 @@ static void che_freep(ChannelElement **s
 }
 
 /**
- * Configure output channel order and optional mixing based on the current
- * program configuration element and user requested channels.
+ * Configure output channel order based on the current program configuration element.
  *
- * \param newpcs New program configuration struct - we only do something if it differs from the current one.
+ * @param   che_pos current channel position configuration struct
+ * @param   new_che_pos New channel position configuration struct - we only do something if it differs from the current one.
+ * @return  Returns error status. 0 - OK, !0 - error
  */
 static int output_configure(AACContext *ac, enum ChannelPosition che_pos[4][MAX_TAGID],
         enum ChannelPosition new_che_pos[4][MAX_TAGID]) {
@@ -174,7 +175,7 @@ static int output_configure(AACContext *
     memcpy(che_pos, new_che_pos, 4 * MAX_TAGID * sizeof(new_che_pos[0][0]));
 
     /* Allocate or free elements depending on if they are in the
-     * current program configuration struct.
+     * current program configuration.
      *
      * Set up default 1:1 output mapping.
      *
@@ -268,7 +269,7 @@ static int program_config_element(AACCon
 }
 
 /**
- * Set up ProgramConfig, but based on a default channel configuration
+ * Set up channel positions based on a default channel configuration
  * as specified in table 1.17.
  */
 static int set_pce_to_defaults(AACContext *ac, enum ChannelPosition new_che_pos[4][MAX_TAGID],

Modified: aac/aacdectab.h
==============================================================================
--- aac/aacdectab.h	(original)
+++ aac/aacdectab.h	Fri Aug  8 14:45:16 2008
@@ -34,6 +34,16 @@
 
 #include <stdint.h>
 
+/* scalefactor window band - term for scalefactor bands within a window,
+ * given in Table 4.110 to Table 4.128.
+ *
+ * scalefactor band - term for scalefactor band within a group. In case
+ * of EIGHT_SHORT_SEQUENCE and grouping a scalefactor band may contain
+ * several scalefactor window bands of corresponding frequency. For all
+ * other window_sequences scalefactor bands and scalefactor window bands
+ * are identical.
+ */
+
 static const uint16_t swb_offset_1024_96[] = {
       0,   4,   8,  12,  16,  20,  24,  28,
      32,  36,  40,  44,  48,  52,  56,  64,