*/
/**
- * @file imc.c IMC - Intel Music Coder
+ * @file
+ * IMC - Intel Music Coder
* A mdct based codec using a 256 points large transform
* divied into 32 bands with some mix of scale factors.
* Only mono is supported.
#define ALT_BITSTREAM_READER
#include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
#include "dsputil.h"
+#include "fft.h"
#include "imcdata.h"
DSPContext dsp;
FFTContext fft;
- DECLARE_ALIGNED_16(FFTComplex, samples[COEFFS/2]);
- DECLARE_ALIGNED_16(float, out_samples[COEFFS]);
+ DECLARE_ALIGNED(16, FFTComplex, samples)[COEFFS/2];
+ float *out_samples;
} IMCContext;
static VLC huffman_vlc[4][4];
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);
/* initialize the VLC tables */
for(i = 0; i < 4 ; i++) {
for(j = 0; j < 4; j++) {
- huffman_vlc[i][j].table = vlc_tables[vlc_offsets[i * 4 + j]];
+ huffman_vlc[i][j].table = &vlc_tables[vlc_offsets[i * 4 + j]];
huffman_vlc[i][j].table_allocated = vlc_offsets[i * 4 + j + 1] - vlc_offsets[i * 4 + j];
init_vlc(&huffman_vlc[i][j], 9, imc_huffman_sizes[i],
imc_huffman_lens[i][j], 1, 1,
ff_fft_init(&q->fft, 7, 1);
dsputil_init(&q->dsp, avctx);
- avctx->sample_fmt = SAMPLE_FMT_S16;
+ avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
return 0;
}
iacc = 0;
for(j = (stream_format_code & 0x2)?4:0; j < BANDS; j++) {
- cwlen = av_clip((int)((q->flcoeffs4[j] * 0.5) - summa + 0.5), 0, 6);
+ cwlen = av_clipf(((q->flcoeffs4[j] * 0.5) - summa + 0.5), 0, 6);
q->bitsBandT[j] = cwlen;
summer += q->bandWidthT[j] * cwlen;
static int imc_decode_frame(AVCodecContext * avctx,
void *data, int *data_size,
- const uint8_t * buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
IMCContext *q = avctx->priv_data;
return -1;
}
for(i = 0; i < IMC_BLOCK_SIZE / 2; i++)
- buf16[i] = bswap_16(((const uint16_t*)buf)[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 */
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;
}
}
-AVCodec imc_decoder = {
+AVCodec ff_imc_decoder = {
.name = "imc",
- .type = CODEC_TYPE_AUDIO,
+ .type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_IMC,
.priv_data_size = sizeof(IMCContext),
.init = imc_decode_init,