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

[jbr]

Author: jbr
Date: Fri Dec 14 03:53:40 2007
New Revision: 1560

Log:
skip unused block start info

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

Modified: eac3/eac3.h
==============================================================================
--- eac3/eac3.h	(original)
+++ eac3/eac3.h	Fri Dec 14 03:53:40 2007
@@ -86,7 +86,6 @@ typedef struct EAC3Context{
     int chahtinu[AC3_MAX_CHANNELS];      ///< Channel AHT in use
     int chinspxatten[AC3_MAX_CHANNELS];  ///< Channel in spectral extension attenuation process
     int spxattencod[AC3_MAX_CHANNELS];   ///< spectral extension attenuation code
-    uint32_t blkstrtinfo;            ///< Block start information
     int ncplblks;
 ///@}
 ///@name Audio block

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Fri Dec 14 03:53:40 2007
@@ -658,13 +658,12 @@ static int parse_audfrm(GetBitContext *g
     }
     /* Block start information */
     if (s->num_blocks > 1 && get_bits1(gbc)) {
-        /* nblkstrtbits determined from frmsiz (see Section E2.3.2.27) */
-        // nblkstrtbits = (numblks - 1) * (4 + ceiling (log2 (words_per_frame)))
-        // where numblks is derived from the numblkscod in Table E2.9
-        // words_per_frame = frmsiz + 1
-        int nblkstrtbits = (s->num_blocks-1) * (4 + av_log2(s->frame_size-2));
-        av_log(s->avctx, AV_LOG_INFO, "nblkstrtbits = %i\n", nblkstrtbits);
-        s->blkstrtinfo = get_bits(gbc, nblkstrtbits);
+        /* reference: Section E2.3.2.27
+           nblkstrtbits = (numblks - 1) * (4 + ceiling(log2(words_per_frame)))
+           Great that the spec tells how to parse. Unfortunately it doesn't say
+           what this data is or what it's used for. */
+        int block_start_bits = (s->num_blocks-1) * (4 + av_log2(s->frame_size-2));
+        skip_bits(gbc, block_start_bits);
     }
     /* Syntax state initialization */
     for (ch = 1; ch <= s->nfchans; ch++) {