---
libavcodec/ac3enc.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git libavcodec/ac3enc.c libavcodec/ac3enc.c
index 48e07c7..a32acc8 100644
--- libavcodec/ac3enc.c
+++ libavcodec/ac3enc.c
@@ -840,7 +840,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;
@@ -965,7 +965,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:
@@ -1189,7 +1189,7 @@ static int AC3_encode_frame(AVCodecContext *avctx,
uint8_t exp[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][AC3_MAX_COEFS];
uint8_t exp_strategy[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS];
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;
deinterleave_samples(s, data);
@@ -1211,7 +1211,7 @@ static int AC3_encode_frame(AVCodecContext *avctx,
/* Normalize the samples to use the maximum available precision */
v = 14 - log2_tab(s->windowed_samples, AC3_BLOCK_SIZE*2);
v = FFMAX(0, v);
- exp_samples[i][ch] = v - 9;
+ exp_shift[i][ch] = v - 9;
lshift_tab(s->windowed_samples, AC3_BLOCK_SIZE*2, v);
/* do the MDCT */
@@ -1224,7 +1224,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;
@@ -1272,7 +1272,7 @@ static int AC3_encode_frame(AVCodecContext *avctx,
for (i = 0; i < AC3_MAX_BLOCKS; i++) {
output_audio_block(s, exp_strategy[i], exp[i], bap[i],
- mdct_coef[i], exp_samples[i], i);
+ mdct_coef[i], exp_shift[i], i);
}
return output_frame_end(s);
}
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
