diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2010-12-14 14:51:53 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2010-12-14 14:51:53 +0000 |
| commit | aab45ca3def0e23376b811a3583d7e2a0e233473 (patch) | |
| tree | 2cc1c8881ae068c1aa940a0affd1b05a37567c6c | |
| parent | 23c5b361a6d9887f189a1ca4271369f7f4928b0d (diff) | |
cosmetics: rename exp_samples and global_exp to exp_shift.
Originally committed as revision 25971 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/ac3enc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 8fba4fb040..c830c38c9d 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -773,7 +773,7 @@ static void output_audio_block(AC3EncodeContext *s, uint8_t encoded_exp[AC3_MAX_CHANNELS][AC3_MAX_COEFS], uint8_t bap[AC3_MAX_CHANNELS][AC3_MAX_COEFS], int32_t mdct_coefs[AC3_MAX_CHANNELS][AC3_MAX_COEFS], - int8_t global_exp[AC3_MAX_CHANNELS], + int8_t exp_shift[AC3_MAX_CHANNELS], int block_num) { int ch, nb_groups, group_size, i, baie, rbnd; @@ -897,7 +897,7 @@ static void output_audio_block(AC3EncodeContext *s, for (i = 0; i < s->nb_coefs[ch]; i++) { c = mdct_coefs[ch][i]; - e = encoded_exp[ch][i] - global_exp[ch]; + e = encoded_exp[ch][i] - exp_shift[ch]; b = bap[ch][i]; switch (b) { case 0: @@ -1089,7 +1089,7 @@ static int ac3_encode_frame(AVCodecContext *avctx, uint8_t exp_strategy[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS]; uint8_t encoded_exp[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][AC3_MAX_COEFS]; uint8_t bap[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][AC3_MAX_COEFS]; - int8_t exp_samples[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS]; + int8_t exp_shift[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS]; int frame_bits; frame_bits = 0; @@ -1123,7 +1123,7 @@ static int ac3_encode_frame(AVCodecContext *avctx, v = 14 - log2_tab(input_samples, AC3_WINDOW_SIZE); if (v < 0) v = 0; - exp_samples[i][ch] = v - 9; + exp_shift[i][ch] = v - 9; lshift_tab(input_samples, AC3_WINDOW_SIZE, v); /* do the MDCT */ @@ -1136,7 +1136,7 @@ static int ac3_encode_frame(AVCodecContext *avctx, if (v == 0) e = 24; else { - e = 23 - av_log2(v) + exp_samples[i][ch]; + e = 23 - av_log2(v) + exp_shift[i][ch]; if (e >= 24) { e = 24; mdct_coef[i][ch][j] = 0; @@ -1185,7 +1185,7 @@ static int ac3_encode_frame(AVCodecContext *avctx, for (i = 0; i < AC3_MAX_BLOCKS; i++) { output_audio_block(s, exp_strategy[i], encoded_exp[i], - bap[i], mdct_coef[i], exp_samples[i], i); + bap[i], mdct_coef[i], exp_shift[i], i); } return output_frame_end(s); } |