On Thu, 18 Oct 2012, Justin Ruggles wrote:
--- libavcodec/atrac3.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-)diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index d15b710..b3e1593 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -39,6 +39,7 @@ #include "libavutil/float_dsp.h" #include "avcodec.h" #include "bytestream.h" +#include "dsputil.h" #include "fft.h" #include "fmtconvert.h" #include "get_bits.h" @@ -50,7 +51,6 @@ #define STEREO 0x2 #define SAMPLES_PER_FRAME 1024 -#define MDCT_SIZE 512 typedef struct GainInfo { int num_gain_data; @@ -114,9 +114,10 @@ typedef struct { FFTContext mdct_ctx; FmtConvertContext fmt_conv; AVFloatDSPContext fdsp; + DSPContext dsp; } ATRAC3Context; -static DECLARE_ALIGNED(32, float, mdct_window)[MDCT_SIZE]; +static DECLARE_ALIGNED(32, float, mdct_window)[256]; static VLC_TYPE atrac3_vlc_table[4096][2]; static VLC spectral_coeff_tab[7]; static float gain_tab1[16]; @@ -149,7 +150,8 @@ static void imlt(ATRAC3Context *q, float *input, float *output, int odd_band) q->mdct_ctx.imdct_calc(&q->mdct_ctx, output, input); /* Perform windowing on the output. */ - q->fdsp.vector_fmul(output, output, mdct_window, MDCT_SIZE); + q->fdsp.vector_fmul(output, output, mdct_window, 256); + q->dsp.vector_fmul_reverse(output + 256, output + 256, mdct_window, 256); } /* @@ -177,19 +179,16 @@ static int decode_bytes(const uint8_t *input, uint8_t *out, int bytes) static av_cold void init_atrac3_window(void) { - float enc_window[256]; - int i; + int i, j; /* generate the mdct window, for details see * http://wiki.multimedia.cx/index.php?title=RealAudio_atrc#Windows */ - for (i = 0; i < 256; i++) - enc_window[i] = (sin(((i + 0.5) / 256.0 - 0.5) * M_PI) + 1.0) * 0.5; - - for (i = 0; i < 256; i++) { - mdct_window[i] = enc_window[i] / - (enc_window[ i] * enc_window[ i] + - enc_window[255 - i] * enc_window[255 - i]); - mdct_window[511 - i] = mdct_window[i]; + for (i = 0, j = 255; i < 128; i++, j--) { + float wi = (sin(((i + 0.5) / 256.0 - 0.5) * M_PI) + 1.0) * 0.5; + float wj = (sin(((j + 0.5) / 256.0 - 0.5) * M_PI) + 1.0) * 0.5; + float w = wi * wi + wj * wj; + mdct_window[i] = wi / w; + mdct_window[j] = wj / w; } } @@ -982,6 +981,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) q->matrix_coeff_index_next[i] = 3; } + ff_dsputil_init(&q->dsp, avctx); avpriv_float_dsp_init(&q->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); ff_fmt_convert_init(&q->fmt_conv, avctx); -- 1.7.1
Ok I guess, but you might want to wait for comments from others. // Martin _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
