diff options
| author | Benjamin Larsson <banan@ludd.ltu.se> | 2009-09-22 17:03:28 +0000 |
|---|---|---|
| committer | Benjamin Larsson <banan@ludd.ltu.se> | 2009-09-22 17:03:28 +0000 |
| commit | edd897b1b3327cd0c2cac3f6518750101fbcad4a (patch) | |
| tree | 68ae38594dec9178423df9512329eb99475e7231 | |
| parent | 138fe832152d4b30528933ca681b39831dd94569 (diff) | |
| download | ffmpeg-edd897b1b3327cd0c2cac3f6518750101fbcad4a.tar.gz | |
Use ff_sine_32 in atrac1.
Originally committed as revision 19967 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/atrac1.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index cac82b3678..746deab2ee 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -82,8 +82,6 @@ typedef struct { DSPContext dsp; } AT1Ctx; -DECLARE_ALIGNED_16(static float, short_window[32]); - /** size of the transform in samples in the long mode for each QMF band */ static const uint16_t samples_per_band[3] = {128, 128, 256}; static const uint8_t mdct_long_nbits[3] = {7, 7, 8}; @@ -134,7 +132,7 @@ static int at1_imdct_block(AT1SUCtx* su, AT1Ctx *q) /* overlap and window long blocks */ q->dsp.vector_fmul_window(q->bands[band_num], &su->spectrum[1][ref_pos + band_samples - 16], - &su->spectrum[0][ref_pos], short_window, 0, 16); + &su->spectrum[0][ref_pos], ff_sine_32, 0, 16); memcpy(q->bands[band_num] + 32, &su->spectrum[0][ref_pos + 16], 240 * sizeof(float)); } else { /* short blocks */ @@ -146,7 +144,7 @@ static int at1_imdct_block(AT1SUCtx* su, AT1Ctx *q) /* overlap and window between short blocks */ q->dsp.vector_fmul_window(&q->bands[band_num][start_pos], prev_buf, - &su->spectrum[0][ref_pos + start_pos], short_window, 0, 16); + &su->spectrum[0][ref_pos + start_pos], ff_sine_32, 0, 16); prev_buf = &su->spectrum[0][ref_pos+start_pos + 16]; start_pos += 32; // use hardcoded block_size @@ -342,7 +340,7 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx) ff_mdct_init(&q->mdct_ctx[1], 8, 1, -1.0/ (1 << 15)); ff_mdct_init(&q->mdct_ctx[2], 9, 1, -1.0/ (1 << 15)); - ff_sine_window_init(short_window, 32); + ff_sine_window_init(ff_sine_32, 32); atrac_generate_tables(); |