GetBitContext gb;
BswapDSPContext bdsp;
- AVFloatDSPContext *fdsp;
+ void (*butterflies_float)(float *av_restrict v1, float *av_restrict v2, int len);
FFTContext fft;
DECLARE_ALIGNED(32, FFTComplex, samples)[COEFFS / 2];
float *out_samples;
static VLC huffman_vlc[4][4];
+#define IMC_VLC_BITS 9
#define VLC_TABLES_SIZE 9512
-static const int vlc_offsets[17] = {
- 0, 640, 1156, 1732, 2308, 2852, 3396, 3924,
- 4452, 5220, 5860, 6628, 7268, 7908, 8424, 8936, VLC_TABLES_SIZE
-};
-
static VLC_TYPE vlc_tables[VLC_TABLES_SIZE][2];
static inline double freq2bark(double freq)
{
int i, j, ret;
IMCContext *q = avctx->priv_data;
+ AVFloatDSPContext *fdsp;
double r1, r2;
if (avctx->codec_id == AV_CODEC_ID_IAC && avctx->sample_rate > 96000) {
q->sqrt_tab[i] = sqrt(i);
/* initialize the VLC tables */
- for (i = 0; i < 4 ; i++) {
+ for (int i = 0, offset = 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_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,
- imc_huffman_bits[i][j], 2, 2, INIT_VLC_USE_NEW_STATIC);
+ huffman_vlc[i][j].table = &vlc_tables[offset];
+ huffman_vlc[i][j].table_allocated = VLC_TABLES_SIZE - offset;;
+ ff_init_vlc_from_lengths(&huffman_vlc[i][j], IMC_VLC_BITS, imc_huffman_sizes[i],
+ imc_huffman_lens[i][j], 1,
+ imc_huffman_syms[i][j], 1, 1,
+ 0, INIT_VLC_STATIC_OVERLONG, NULL);
+ offset += huffman_vlc[i][j].table_size;
}
}
memcpy(q->weights2, imc_weights2, sizeof(imc_weights2));
}
+ fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT);
+ if (!fdsp)
+ return AVERROR(ENOMEM);
+ q->butterflies_float = fdsp->butterflies_float;
+ av_free(fdsp);
if ((ret = ff_fft_init(&q->fft, 7, 1))) {
av_log(avctx, AV_LOG_INFO, "FFT init failed\n");
return ret;
}
ff_bswapdsp_init(&q->bdsp);
- q->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT);
- if (!q->fdsp) {
- ff_fft_end(&q->fft);
-
- return AVERROR(ENOMEM);
- }
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO
levlCoeffs[0] = get_bits(&q->gb, 7);
for (i = start; i < BANDS; i++) {
levlCoeffs[i] = get_vlc2(&q->gb, hufftab[cb_sel[i]]->table,
- hufftab[cb_sel[i]]->bits, 2);
+ IMC_VLC_BITS, 2);
if (levlCoeffs[i] == 17)
levlCoeffs[i] += get_bits(&q->gb, 4);
}
}
if (avctx->channels == 2) {
- q->fdsp->butterflies_float((float *)frame->extended_data[0],
- (float *)frame->extended_data[1], COEFFS);
+ q->butterflies_float((float *)frame->extended_data[0],
+ (float *)frame->extended_data[1], COEFFS);
}
*got_frame_ptr = 1;
IMCContext *q = avctx->priv_data;
ff_fft_end(&q->fft);
- av_freep(&q->fdsp);
return 0;
}