Commit 66b84e4a authored by Vitor Sessak's avatar Vitor Sessak
Browse files

Make Intel Music Coder output SAMPLE_FMT_FLT

Originally committed as revision 24267 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent db979afe
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment