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

[jbr]

Author: jbr
Date: Sat Dec 29 06:11:15 2007
New Revision: 1690

Log:
rename some more variables

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

Modified: eac3/eac3.h
==============================================================================
--- eac3/eac3.h	(original)
+++ eac3/eac3.h	Sat Dec 29 06:11:15 2007
@@ -136,8 +136,8 @@ typedef struct EAC3Context{
 ///@}
 
 ///@defgroup rematrixing Rematrixing
-    int nrematbnds;     ///< Number of rematrixing bands
-    int rematflg[4];    ///< Rematrixing flag
+    int num_rematrixing_bands;  ///< Number of rematrixing bands (nrematbnds)
+    int rematrixing_flags[4];   ///< Rematrixing flags (rematflg)
 ///@}
 
 ///@defgroup exponents Exponents
@@ -150,11 +150,11 @@ typedef struct EAC3Context{
     AC3BitAllocParameters bit_alloc_params;         ///< Bit allocation parameters
     int first_cpl_leak;                             ///< First coupling leak state (firstcplleak)
     int snr_offset[AC3_MAX_CHANNELS];               ///< SNR offset (snroffst)
-    int fgain[AC3_MAX_CHANNELS];                    ///< Channel fast gain
+    int fast_gain[AC3_MAX_CHANNELS];                ///< Channel fast gain (fgain)
     uint8_t bap[AC3_MAX_CHANNELS][AC3_MAX_COEFS];   ///< bit allocation pointers
     uint8_t hebap[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< high-efficiency bit allocation pointers for AHT
     int16_t psd[AC3_MAX_CHANNELS][AC3_MAX_COEFS];   ///< scaled exponents
-    int16_t bndpsd[AC3_MAX_CHANNELS][50];           ///< interpolated exponents
+    int16_t band_psd[AC3_MAX_CHANNELS][50];         ///< interpolated exponents (bndpsd)
     int16_t mask[AC3_MAX_CHANNELS][50];             ///< masking values
     uint8_t dba_mode[AC3_MAX_CHANNELS];             ///< Delta bit allocation mode (deltbae)
     uint8_t dba_nsegs[AC3_MAX_CHANNELS];            ///< Number of delta segments (deltnseg)

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Sat Dec 29 06:11:15 2007
@@ -990,9 +990,9 @@ static int parse_audblk(EAC3Context *s, 
         int end = (s->cpl_in_use[blk] || s->spxinu) ?
             FFMIN(s->end_freq[1], s->end_freq[2]) : (ff_ac3_rematrix_band_tab[4]-1);
         for (bnd = 0; ff_ac3_rematrix_band_tab[bnd] <= end; bnd++) {
-            s->rematflg[bnd] = get_bits1(gbc);
+            s->rematrixing_flags[bnd] = get_bits1(gbc);
         }
-        s->nrematbnds = bnd;
+        s->num_rematrixing_bands = bnd;
     }
     /* Channel bandwidth code */
     for (ch = 1; ch <= s->fbw_channels; ch++) {
@@ -1052,10 +1052,10 @@ static int parse_audblk(EAC3Context *s, 
 
     if (s->fast_gain_syntax && get_bits1(gbc)) {
         for (ch = !s->cpl_in_use[blk]; ch <= s->num_channels; ch++)
-            s->fgain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)];
+            s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)];
     } else if (!blk) {
         for (ch = !s->cpl_in_use[blk]; ch <= s->num_channels; ch++)
-            s->fgain[ch] = ff_ac3_fast_gain_tab[4];
+            s->fast_gain[ch] = ff_ac3_fast_gain_tab[4];
     }
     if (s->stream_type == EAC3_STREAM_TYPE_INDEPENDENT && get_bits1(gbc)) {
         skip_bits(gbc, 10); //Converter SNR offset
@@ -1098,13 +1098,13 @@ static int parse_audblk(EAC3Context *s, 
     /* run bit allocation */
     for (ch = !s->cpl_in_use[blk]; ch <= s->num_channels; ch++) {
         ff_ac3_bit_alloc_calc_psd((int8_t *)s->dexps[ch], s->start_freq[ch],
-                s->end_freq[ch], s->psd[ch], s->bndpsd[ch]);
+                s->end_freq[ch], s->psd[ch], s->band_psd[ch]);
 
         s->bit_alloc_params.sr_code = s->sr_code;
         s->bit_alloc_params.sr_shift = 0;
 
-        ff_ac3_bit_alloc_calc_mask(&s->bit_alloc_params, s->bndpsd[ch],
-                s->start_freq[ch], s->end_freq[ch], s->fgain[ch],
+        ff_ac3_bit_alloc_calc_mask(&s->bit_alloc_params, s->band_psd[ch],
+                s->start_freq[ch], s->end_freq[ch], s->fast_gain[ch],
                 (ch == s->lfe_channel), s->dba_mode[ch], s->dba_nsegs[ch],
                 s->dba_offsets[ch], s->dba_lengths[ch], s->dba_values[ch],
                 s->mask[ch]);
@@ -1233,7 +1233,7 @@ static int eac3_decode_frame(AVCodecCont
         if (c->channel_mode == AC3_CHMODE_STEREO)
             ff_ac3_do_rematrixing(c->transform_coeffs,
                     FFMIN(c->end_freq[1], c->end_freq[2]),
-                    c->nrematbnds, c->rematflg);
+                    c->num_rematrixing_bands, c->rematrixing_flags);
 
         /* apply scaling to coefficients (dialnorm, dynrng) */
         for (ch = 1; ch <= c->fbw_channels + c->lfe_on; ch++) {