diff options
| author | Vitor Sessak <vitor1001@gmail.com> | 2010-07-16 16:50:56 +0000 |
|---|---|---|
| committer | Vitor Sessak <vitor1001@gmail.com> | 2010-07-16 16:50:56 +0000 |
| commit | 66b84e4ab2fc96222dab32173d84f4a403129deb (patch) | |
| tree | a8ac4cc0160052c0887fa5305f9071fe38d824af /libavcodec/imc.c | |
| parent | db979afed26fa8526b027a1137b247ae0bda2423 (diff) | |
Make Intel Music Coder output SAMPLE_FMT_FLT
Originally committed as revision 24267 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/imc.c')
| -rw-r--r-- | libavcodec/imc.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/imc.c b/libavcodec/imc.c index a27e4b6d32..b54937539d 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -87,7 +87,7 @@ typedef struct { DSPContext dsp; FFTContext fft; DECLARE_ALIGNED(16, FFTComplex, samples)[COEFFS/2]; - DECLARE_ALIGNED(16, float, out_samples)[COEFFS]; + float *out_samples; } IMCContext; static VLC huffman_vlc[4][4]; @@ -116,8 +116,8 @@ static av_cold int imc_decode_init(AVCodecContext * avctx) for(i = 0; i < COEFFS; i++) q->mdct_sine_window[i] *= sqrt(2.0); for(i = 0; i < COEFFS/2; i++){ - q->post_cos[i] = cos(i / 256.0 * M_PI); - q->post_sin[i] = sin(i / 256.0 * M_PI); + q->post_cos[i] = (1.0f / 32768) * cos(i / 256.0 * M_PI); + q->post_sin[i] = (1.0f / 32768) * sin(i / 256.0 * M_PI); r1 = sin((i * 4.0 + 1.0) / 1024.0 * M_PI); r2 = cos((i * 4.0 + 1.0) / 1024.0 * M_PI); @@ -156,7 +156,7 @@ static av_cold int imc_decode_init(AVCodecContext * avctx) ff_fft_init(&q->fft, 7, 1); dsputil_init(&q->dsp, avctx); - avctx->sample_fmt = SAMPLE_FMT_S16; + avctx->sample_fmt = SAMPLE_FMT_FLT; avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO; return 0; } @@ -662,6 +662,7 @@ static int imc_decode_frame(AVCodecContext * avctx, for(i = 0; i < IMC_BLOCK_SIZE / 2; i++) buf16[i] = av_bswap16(((const uint16_t*)buf)[i]); + q->out_samples = data; init_get_bits(&q->gb, (const uint8_t*)buf16, IMC_BLOCK_SIZE * 8); /* Check the frame header */ @@ -805,9 +806,7 @@ static int imc_decode_frame(AVCodecContext * avctx, imc_imdct256(q); - q->dsp.float_to_int16(data, q->out_samples, COEFFS); - - *data_size = COEFFS * sizeof(int16_t); + *data_size = COEFFS * sizeof(float); return IMC_BLOCK_SIZE; } |