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

[superdump]

Author: superdump
Date: Thu Aug  7 13:47:34 2008
New Revision: 3062

Log:
Rename ChannelType as ChannelPosition to avoid confusing type with SCEs/CPEs


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

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Thu Aug  7 13:47:34 2008
@@ -275,10 +275,10 @@ static int output_configure(AACContext *
  * @param sce_map mono (Single Channel Element) map
  * @param type speaker type/position for these channels
  */
-static void program_config_element_parse_tags(enum ChannelType *cpe_map,
-        enum ChannelType *sce_map, enum ChannelType type, GetBitContext * gb, int n) {
+static void program_config_element_parse_tags(enum ChannelPosition *cpe_map,
+        enum ChannelPosition *sce_map, enum ChannelPosition type, GetBitContext * gb, int n) {
     while(n--) {
-        enum ChannelType *map = cpe_map && get_bits1(gb) ? cpe_map : sce_map; // stereo or mono map
+        enum ChannelPosition *map = cpe_map && get_bits1(gb) ? cpe_map : sce_map; // stereo or mono map
         map[get_bits(gb, 4)] = type;
     }
 }

Modified: aac/aac.h
==============================================================================
--- aac/aac.h	(original)
+++ aac/aac.h	Thu Aug  7 13:47:34 2008
@@ -132,7 +132,7 @@ enum BandType {
 
 #define IS_CODEBOOK_UNSIGNED(x) ((x - 1) & 10)
 
-enum ChannelType {
+enum ChannelPosition {
     AAC_CHANNEL_FRONT = 1,
     AAC_CHANNEL_SIDE  = 2,
     AAC_CHANNEL_BACK  = 3,
@@ -154,7 +154,7 @@ enum {
  * stream (ID_PCE) or created based on a default fixed channel arrangement.
  */
 typedef struct {
-    enum ChannelType che_type[4][MAX_TAGID]; ///< channel element type with the first index as the first 4 raw_data_block IDs
+    enum ChannelPosition che_type[4][MAX_TAGID]; ///< channel element type with the first index as the first 4 raw_data_block IDs
     int mono_mixdown_tag;                    ///< The SCE tag to use if user requests mono   output, -1 if not available.
     int stereo_mixdown_tag;                  ///< The CPE tag to use if user requests stereo output, -1 if not available.
     int mixdown_coeff_index;                 ///< 0-3