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

[jbr]

Author: jbr
Date: Fri Dec 14 03:20:41 2007
New Revision: 1559

Log:
remove unused variables for transient pre-noise processing. skip related info
when parsing. add TODO comment.

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

Modified: eac3/eac3.h
==============================================================================
--- eac3/eac3.h	(original)
+++ eac3/eac3.h	Fri Dec 14 03:20:41 2007
@@ -84,9 +84,6 @@ typedef struct EAC3Context{
     int cplstre[MAX_BLOCKS];         ///< Coupling strategy exists
     int chexpstr[MAX_BLOCKS][AC3_MAX_CHANNELS];  ///< Channel exponent strategy
     int chahtinu[AC3_MAX_CHANNELS];      ///< Channel AHT in use
-    int chintransproc[AC3_MAX_CHANNELS]; ///< Channel in transient pre-noise processing
-    int transprocloc[AC3_MAX_CHANNELS];  ///< Transient location relative to start of frame
-    int transproclen[AC3_MAX_CHANNELS];  ///< Transient processing length
     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

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Fri Dec 14 03:20:41 2007
@@ -637,17 +637,12 @@ static int parse_audfrm(GetBitContext *g
     }
     /* Audio frame transient pre-noise processing data */
     if (s->transproce) {
-        av_log(s->avctx, AV_LOG_ERROR, "transient pre-noise processing NOT IMPLEMENTED\n");
-        return -1;
-#if 0
         for (ch = 1; ch <= s->nfchans; ch++) {
-            s->chintransproc[ch] = get_bits1(gbc);
-            if (s->chintransproc[ch]) {
-                s->transprocloc[ch] = get_bits(gbc, 10);
-                s->transproclen[ch] = get_bits(gbc, 8);
+            if (get_bits1(gbc)) { // channel in transient processing
+                skip_bits(gbc, 10); // skip transient processing location
+                skip_bits(gbc, 8);  // skip transient processing length
             }
         }
-#endif
     }
     /* Spectral extension attenuation data */
     if (s->spxattene) {
@@ -1320,6 +1315,8 @@ static int eac3_decode_frame(AVCodecCont
 
         do_imdct(c);
 
+        // TODO: Transient Pre-Noise Cross-Fading
+
         if (avctx->channels != c->num_channels) {
             ff_ac3_downmix(c->output, c->nfchans, avctx->channels, c->downmix_coeffs);
         }