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

[jbr]

Author: jbr
Date: Fri Dec 14 05:46:52 2007
New Revision: 1565

Log:
rename lfeon to lfe_on

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

Modified: eac3/eac3.h
==============================================================================
--- eac3/eac3.h	(original)
+++ eac3/eac3.h	Fri Dec 14 05:46:52 2007
@@ -49,7 +49,7 @@ typedef struct EAC3Context{
     int sr_code2;                    ///< Sample rate code 2
     int num_blocks;                  ///< Number of audio blocks
     int channel_mode;                ///< Channel mode (acmod)
-    int lfeon;                       ///< Low frequency effect channel on
+    int lfe_on;                      ///< Low frequency effect channel on
     int bsid;                        ///< Bit stream identification
     float dialnorm[2];               ///< Dialogue normalization
     int mixmdate;                    ///< Mixing meta-data exists

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Fri Dec 14 05:46:52 2007
@@ -361,13 +361,13 @@ static int parse_bsi(GetBitContext *gbc,
         s->num_blocks = ff_eac3_blocks[get_bits(gbc, 2)];
     }
     s->channel_mode = get_bits(gbc, 3);
-    s->lfeon = get_bits1(gbc);
+    s->lfe_on = get_bits1(gbc);
 
     // calculate number of channels
     s->nfchans = ff_ac3_channels_tab[s->channel_mode];
     s->num_channels = s->nfchans;
     s->lfe_channel = s->num_channels+1;
-    if (s->lfeon) {
+    if (s->lfe_on) {
         s->strtmant[s->lfe_channel] = 0;
         s->endmant [s->lfe_channel] = 7;
         s->nchgrps [s->lfe_channel] = 2;
@@ -431,7 +431,7 @@ static int parse_bsi(GetBitContext *gbc,
                     surmixlev * LEVEL_MINUS_3DB;
             }
         }
-        if (s->lfeon) {
+        if (s->lfe_on) {
             /* if the LFE channel exists */
             s->lfemixlevcode = get_bits1(gbc);
             if (s->lfemixlevcode) {
@@ -610,7 +610,7 @@ static int parse_audfrm(GetBitContext *g
         }
     }
     /* LFE exponent strategy */
-    if (s->lfeon) {
+    if (s->lfe_on) {
         for (blk = 0; blk < s->num_blocks; blk++) {
             s->chexpstr[blk][s->lfe_channel] = get_bits1(gbc);
         }
@@ -1221,7 +1221,7 @@ static int parse_audblk(GetBitContext *g
 static void do_imdct(EAC3Context *ctx){
     int ch;
 
-    for (ch = 1; ch <= ctx->nfchans + ctx->lfeon; ch++) {
+    for (ch = 1; ch <= ctx->nfchans + ctx->lfe_on; ch++) {
         if (ctx->blksw[ch]) {
             /* 256-point IMDCT */
             ff_ac3_do_imdct_256(ctx->tmp_output, ctx->transform_coeffs[ch],
@@ -1308,7 +1308,7 @@ static int eac3_decode_frame(AVCodecCont
                     c->nrematbnds, c->rematflg);
 
         /* apply scaling to coefficients (dialnorm, dynrng) */
-        for (ch = 1; ch <= c->nfchans + c->lfeon; ch++) {
+        for (ch = 1; ch <= c->nfchans + c->lfe_on; ch++) {
             float gain=2.0f;
             if (c->channel_mode == AC3_CHMODE_DUALMONO) {
                 gain *= c->dialnorm[ch-1] * c->dynrng[ch-1];