diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2010-12-14 14:50:40 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2010-12-14 14:50:40 +0000 |
| commit | 1fda2c10f640d9706d0ae0eda815e8f723a1d35d (patch) | |
| tree | 9e4f20036f5fba585759c52ecf2ff26d7e7d95c4 | |
| parent | 7066cc8f2b29ac5851b4f74e353b34bf0251bd8b (diff) | |
| download | ffmpeg-1fda2c10f640d9706d0ae0eda815e8f723a1d35d.tar.gz | |
cosmetics: Define AC3_WINDOW_SIZE and use it instead of AC3_BLOCK_SIZE*2.
Originally committed as revision 25951 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/ac3.h | 1 | ||||
| -rw-r--r-- | libavcodec/ac3enc.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index 7cfa51a0c6..1840766813 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -36,6 +36,7 @@ #define AC3_BLOCK_SIZE 256 #define AC3_MAX_BLOCKS 6 #define AC3_FRAME_SIZE (AC3_MAX_BLOCKS * 256) +#define AC3_WINDOW_SIZE (AC3_BLOCK_SIZE * 2) /* exponent encoding strategy */ #define EXP_REUSE 0 diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 6d5305b165..3fc6864e20 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -1187,7 +1187,7 @@ static int AC3_encode_frame(AVCodecContext *avctx, AC3EncodeContext *s = avctx->priv_data; const int16_t *samples = data; int i, j, k, v, ch; - int16_t input_samples[AC3_BLOCK_SIZE*2]; + int16_t input_samples[AC3_WINDOW_SIZE]; int32_t mdct_coef[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][AC3_MAX_COEFS]; uint8_t exp[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][AC3_MAX_COEFS]; uint8_t exp_strategy[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS]; @@ -1219,17 +1219,17 @@ static int AC3_encode_frame(AVCodecContext *avctx, for(j=0;j<AC3_BLOCK_SIZE;j++) { input_samples[j] = MUL16(input_samples[j], ff_ac3_window[j]) >> 15; - input_samples[AC3_BLOCK_SIZE*2-j-1] = MUL16(input_samples[AC3_BLOCK_SIZE*2-j-1], + input_samples[AC3_WINDOW_SIZE-j-1] = MUL16(input_samples[AC3_WINDOW_SIZE-j-1], ff_ac3_window[j]) >> 15; } /* Normalize the samples to use the maximum available precision */ - v = 14 - log2_tab(input_samples, AC3_BLOCK_SIZE*2); + v = 14 - log2_tab(input_samples, AC3_WINDOW_SIZE); if (v < 0) v = 0; exp_samples[i][ch] = v - 9; - lshift_tab(input_samples, AC3_BLOCK_SIZE*2, v); + lshift_tab(input_samples, AC3_WINDOW_SIZE, v); /* do the MDCT */ mdct512(mdct_coef[i][ch], input_samples); |