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

[jbr]

Author: jbr
Date: Fri Dec 14 07:54:19 2007
New Revision: 1571

Log:
remove unused variable and simplify parsing of mixing metadata

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

Modified: eac3/eac3.h
==============================================================================
--- eac3/eac3.h	(original)
+++ eac3/eac3.h	Fri Dec 14 07:54:19 2007
@@ -52,7 +52,6 @@ typedef struct EAC3Context{
     int lfe_on;                      ///< Low frequency effect channel on (lfeon)
     int bitstream_id;                ///< Bit stream identification (bsid)
     float dialog_norm[2];            ///< Dialogue normalization (dialnorm)
-    int dmixmod;                     ///< Preferred stereo downmix mode
     int lfemixlevcod;                ///< lfe mix level code
     int pgmscl[2];                   ///< Program scale factor
     int extpgmscl;                   ///< External program scale factor

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Fri Dec 14 07:54:19 2007
@@ -409,9 +409,9 @@ static int parse_bsi(GetBitContext *gbc,
         /* Mixing metadata */
         if (s->channel_mode > 2) {
             /* if more than 2 channels */
-            s->dmixmod = get_bits(gbc, 2);
-        }
-        if ((s->channel_mode & 1) && (s->channel_mode > 2)) {
+            skip_bits(gbc, 2);  // skip preferred stereo downmix mode
+
+        if (s->channel_mode & 1) {
             /* if three front channels exist */
             skip_bits(gbc, 3); //skip Lt/Rt center mix level
             s->downmix_coeffs[1][0] = s->downmix_coeffs[1][1] = mixlevels[get_bits(gbc, 3)];
@@ -430,6 +430,7 @@ static int parse_bsi(GetBitContext *gbc,
                     surmixlev * LEVEL_MINUS_3DB;
             }
         }
+        }
         if (s->lfe_on) {
             /* if the LFE channel exists */
             if (get_bits1(gbc)) {