[FFmpeg-soc] [soc]: r3017 - eac3/ac3dec.c
jbr
subversion at mplayerhq.hu
Tue Aug 5 03:07:58 CEST 2008
Author: jbr
Date: Tue Aug 5 03:07:57 2008
New Revision: 3017
Log:
cosmetics: indentation and line wrap after last commit
Modified:
eac3/ac3dec.c
Modified: eac3/ac3dec.c
==============================================================================
--- eac3/ac3dec.c (original)
+++ eac3/ac3dec.c Tue Aug 5 03:07:57 2008
@@ -1039,22 +1039,21 @@ static int decode_audio_block(AC3DecodeC
}
/* fast gain (E-AC-3 only) */
- if (s->fast_gain_syntax && get_bits1(gbc)) {
- for (ch = !cpl_in_use; ch <= s->channels; ch++) {
- int prev = s->fast_gain[ch];
- s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)];
- /* run last 2 bit allocation stages if fast gain changes */
- if(blk && prev != s->fast_gain[ch])
- bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2);
- }
- } else if (s->eac3 && !blk) {
- for (ch = !cpl_in_use; ch <= s->channels; ch++)
- s->fast_gain[ch] = ff_ac3_fast_gain_tab[4];
+ if (s->fast_gain_syntax && get_bits1(gbc)) {
+ for (ch = !cpl_in_use; ch <= s->channels; ch++) {
+ int prev = s->fast_gain[ch];
+ s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)];
+ /* run last 2 bit allocation stages if fast gain changes */
+ if(blk && prev != s->fast_gain[ch])
+ bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2);
}
+ } else if (s->eac3 && !blk) {
+ for (ch = !cpl_in_use; ch <= s->channels; ch++)
+ s->fast_gain[ch] = ff_ac3_fast_gain_tab[4];
+ }
/* E-AC-3 to AC-3 converter SNR offset */
- if (s->frame_type == EAC3_FRAME_TYPE_INDEPENDENT &&
- get_bits1(gbc)) {
+ if (s->frame_type == EAC3_FRAME_TYPE_INDEPENDENT && get_bits1(gbc)) {
skip_bits(gbc, 10); // skip converter snr offset
}
@@ -1075,7 +1074,7 @@ static int decode_audio_block(AC3DecodeC
av_log(s->avctx, AV_LOG_ERROR, "new coupling leak info must be present in block 0\n");
return -1;
}
- s->first_cpl_leak = 0;
+ s->first_cpl_leak = 0;
}
/* delta bit allocation information */
More information about the FFmpeg-soc
mailing list