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

[jbr]

Author: jbr
Date: Sat Dec 15 00:29:15 2007
New Revision: 1578

Log:
remove unused paninfo variable. add reference for future implementation.

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

Modified: eac3/eac3.h
==============================================================================
--- eac3/eac3.h	(original)
+++ eac3/eac3.h	Sat Dec 15 00:29:15 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 paninfo[2];                  ///< Pan information
     int blkmixcfginfo[6];            ///< Block mixing configuration information
 ///@}
 ///@name Audio Frame

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Sat Dec 15 00:29:15 2007
@@ -454,13 +454,15 @@ static int parse_bsi(GetBitContext *gbc,
                 case 2: skip_bits(gbc, 12);                    break;
                 case 3: skip_bits(gbc, 8*get_bits(gbc, 5)+16); break;
             }
+            /* skip pan information for mono or dual mono source */
             if (s->channel_mode < 2) {
-                /* if mono or dual mono source */
                 for (i = 0; i < (s->channel_mode ? 1 : 2); i++) {
                     if (get_bits1(gbc)) {
-                        s->paninfo[i] = get_bits(gbc, 14);
-                    } else {
-                        //TODO default = center
+                        /* note: this is not in the ATSC A/52B specification
+                           reference: ETSI TS 102 366 V1.1.1
+                                      section: E.1.3.1.25 */
+                        skip_bits(gbc, 8);  // skip Pan mean direction index
+                        skip_bits(gbc, 6);  // skip reserved paninfo bits
                     }
                 }
             }