[FFmpeg-soc] [soc]: r1562 - in eac3: eac3.h eac3dec.c

[jbr]

Author: jbr
Date: Fri Dec 14 04:17:52 2007
New Revision: 1562

Log:
Remove parsing of custom channel map. It is only for dependent streams, which
are not implemented yet.

Modified:
   eac3/eac3.h
   eac3/eac3dec.c

Modified: eac3/eac3.h
==============================================================================
--- eac3/eac3.h	(original)
+++ eac3/eac3.h	Fri Dec 14 04:17:52 2007
@@ -52,7 +52,6 @@ typedef struct EAC3Context{
     int lfeon;                       ///< Low frequency effect channel on
     int bsid;                        ///< Bit stream identification
     float dialnorm[2];               ///< Dialogue normalization
-    int chanmap;                     ///< Custom channel map
     int mixmdate;                    ///< Mixing meta-data exists
     int dmixmod;                     ///< Preferred stereo downmix mode
     int lfemixlevcode;               ///< lfe mix level code exists

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Fri Dec 14 04:17:52 2007
@@ -387,13 +387,16 @@ static int parse_bsi(GetBitContext *gbc,
             skip_bits(gbc, 8); //skip Compression gain word
         }
     }
+#if 0
+    /* TODO: Add support for dependent streams */
     if (s->stream_type == EAC3_STREAM_TYPE_DEPENDENT) {
         if (get_bits1(gbc)) {
-            s->chanmap = get_bits(gbc, 16);
+            skip_bits(gbc, 16); // skip custom channel map
         } else {
             //TODO default channel map based on acmod and lfeon
         }
     }
+#endif
 
     /* set stereo downmixing coefficients
        reference: Section 7.8.2 Downmixing Into Two Channels */