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

[jbr]

Author: jbr
Date: Tue Jan  1 23:54:27 2008
New Revision: 1744

Log:
cosmetics: rename nchgrps to num_exp_groups

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

Modified: eac3/ac3dec.c
==============================================================================
--- eac3/ac3dec.c	(original)
+++ eac3/ac3dec.c	Tue Jan  1 23:54:27 2008
@@ -321,7 +321,7 @@ int ff_ac3_parse_frame_header(AC3DecodeC
         s->output_mode |= AC3_OUTPUT_LFEON;
         s->start_freq[s->lfe_ch] = 0;
         s->end_freq[s->lfe_ch] = 7;
-        s->nchgrps[s->lfe_ch] = 2;
+        s->num_exp_groups[s->lfe_ch] = 2;
         s->channel_in_cpl[s->lfe_ch] = 0;
     }
 

Modified: eac3/ac3dec.h
==============================================================================
--- eac3/ac3dec.h	(original)
+++ eac3/ac3dec.h	Tue Jan  1 23:54:27 2008
@@ -176,7 +176,7 @@ typedef struct AC3DecodeContext {
 ///@}
 
 ///@defgroup exponents Exponents
-    int nchgrps[AC3_MAX_CHANNELS];                  ///< Number of fbw channel exponent groups
+    int num_exp_groups[AC3_MAX_CHANNELS];           ///< Number of exponent groups
     uint8_t dexps[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< Differential exponents
     int exp_strategy[MAX_BLOCKS][AC3_MAX_CHANNELS]; ///< Channel exponent strategy (chexpstr)
 ///@}

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Tue Jan  1 23:54:27 2008
@@ -997,7 +997,7 @@ int ff_eac3_parse_audio_block(AC3DecodeC
                 s->exp_strategy[blk][ch] = get_bits(gbc, 2);
         }
     }
-    s->nchgrps[CPL_CH] = (s->end_freq[CPL_CH] - s->start_freq[CPL_CH]) /
+    s->num_exp_groups[CPL_CH] = (s->end_freq[CPL_CH] - s->start_freq[CPL_CH]) /
                          (3 << (s->exp_strategy[blk][CPL_CH] - 1));
 
     /* Channel bandwidth code */
@@ -1017,14 +1017,14 @@ int ff_eac3_parse_audio_block(AC3DecodeC
                 s->end_freq[ch] = ((chbwcod + 12) * 3) + 37; /* (ch is not coupled) */
             }
             grpsize = 3 << (s->exp_strategy[blk][ch] - 1);
-            s->nchgrps[ch] = (s->end_freq[ch] + grpsize - 4) / grpsize;
+            s->num_exp_groups[ch] = (s->end_freq[ch] + grpsize - 4) / grpsize;
         }
     }
     /* Exponents */
     for (ch = !s->cpl_in_use[blk]; ch <= s->channels; ch++) {
         if (s->exp_strategy[blk][ch] != EXP_REUSE) {
             s->dexps[ch][0] = get_bits(gbc, 4) << !ch;
-            ff_ac3_decode_exponents(gbc, s->exp_strategy[blk][ch], s->nchgrps[ch],
+            ff_ac3_decode_exponents(gbc, s->exp_strategy[blk][ch], s->num_exp_groups[ch],
                     s->dexps[ch][0], s->dexps[ch]+s->start_freq[ch]+!!ch);
             if (ch != CPL_CH && ch != s->lfe_ch)
                 skip_bits(gbc, 2); /* skip gainrng */