[FFmpeg-soc] [soc]: r2210 - in eac3: ac3dec_data.c ac3dec_data.h

[jbr]

Author: jbr
Date: Mon May 26 16:46:24 2008
New Revision: 2210

Log:
cosmetics: change comments, names, and indentation to match ffmpeg svn.

Modified:
   eac3/ac3dec_data.c
   eac3/ac3dec_data.h

Modified: eac3/ac3dec_data.c
==============================================================================
--- eac3/ac3dec_data.c	(original)
+++ eac3/ac3dec_data.c	Mon May 26 16:46:24 2008
@@ -1108,17 +1108,14 @@ const uint8_t ff_eac3_frm_expstr[32][6] 
  * Default channel map for a dependent substream defined by acmod
  */
 const uint16_t ff_eac3_default_chmap[8] = {
-    AC3_CHMAP_LEFT | AC3_CHMAP_RIGHT, // FIXME Ch1+Ch2
-    AC3_CHMAP_CENTRE,
-    AC3_CHMAP_LEFT | AC3_CHMAP_RIGHT,
-    AC3_CHMAP_LEFT | AC3_CHMAP_CENTRE | AC3_CHMAP_RIGHT,
-    AC3_CHMAP_LEFT | AC3_CHMAP_RIGHT | AC3_CHMAP_CENTRE_SURROUND,
-    AC3_CHMAP_LEFT | AC3_CHMAP_CENTRE | AC3_CHMAP_RIGHT |
-    AC3_CHMAP_CENTRE_SURROUND,
-    AC3_CHMAP_LEFT | AC3_CHMAP_RIGHT | AC3_CHMAP_LEFT_SURROUND |
-        AC3_CHMAP_RIGHT_SURROUND,
-    AC3_CHMAP_LEFT | AC3_CHMAP_CENTRE | AC3_CHMAP_RIGHT |
-        AC3_CHMAP_LEFT_SURROUND | AC3_CHMAP_RIGHT_SURROUND
+    AC3_CHMAP_L |               AC3_CHMAP_R, // FIXME Ch1+Ch2
+                  AC3_CHMAP_C,
+    AC3_CHMAP_L |               AC3_CHMAP_R,
+    AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R,
+    AC3_CHMAP_L |               AC3_CHMAP_R |                   AC3_CHMAP_C_SUR,
+    AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R |                   AC3_CHMAP_C_SUR,
+    AC3_CHMAP_L |               AC3_CHMAP_R | AC3_CHMAP_L_SUR |                  AC3_CHMAP_R_SUR,
+    AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R | AC3_CHMAP_L_SUR |                  AC3_CHMAP_R_SUR
 };
 
 /**

Modified: eac3/ac3dec_data.h
==============================================================================
--- eac3/ac3dec_data.h	(original)
+++ eac3/ac3dec_data.h	Mon May 26 16:46:24 2008
@@ -40,15 +40,18 @@ extern const uint8_t ff_ac3_rematrix_ban
 extern const uint16_t ff_eac3_default_chmap[8];
 
 /** Custom channel map locations bitmask
- *  Other channels described in documentation: Lc/Rc pair, Lrs/Rrs pair, Ts, Lsd/Rsd pair, Lw/Rw pair, Lvh/Rvh pair, Cvh, Reserved, LFE2 */
-enum {
-    AC3_CHMAP_LEFT =            1<<0,
-    AC3_CHMAP_CENTRE =          1<<1,
-    AC3_CHMAP_RIGHT =           1<<2,
-    AC3_CHMAP_LEFT_SURROUND =   1<<3,
-    AC3_CHMAP_RIGHT_SURROUND =  1<<4,
-    AC3_CHMAP_CENTRE_SURROUND = 1<<7,
-    AC3_CHMAP_LFE =             1<<15
+ *  Other channels described in documentation:
+ *      Lc/Rc pair, Lrs/Rrs pair, Ts, Lsd/Rsd pair,
+ *      Lw/Rw pair, Lvh/Rvh pair, Cvh, Reserved, LFE2
+ */
+enum CustomChannelMapLocation{
+    AC3_CHMAP_L=        1<<(15-0),
+    AC3_CHMAP_C=        1<<(15-1),
+    AC3_CHMAP_R=        1<<(15-2),
+    AC3_CHMAP_L_SUR=    1<<(15-3),
+    AC3_CHMAP_R_SUR =   1<<(15-4),
+    AC3_CHMAP_C_SUR=    1<<(15-7),
+    AC3_CHMAP_LFE =     1<<(15-15)
 };
 
 #endif /* FFMPEG_AC3DEC_DATA_H */