*/
/**
- * @file libavcodec/wmadec.c
+ * @file
* WMA compatible decoder.
* This decoder handles Microsoft Windows Media Audio data, versions 1 & 2.
* WMA v1 is identified by audio format 0x160 in Microsoft media files
static int wma_decode_init(AVCodecContext * avctx)
{
WMACodecContext *s = avctx->priv_data;
- int i, flags1, flags2;
+ int i, flags2;
uint8_t *extradata;
s->avctx = avctx;
/* extract flag infos */
- flags1 = 0;
flags2 = 0;
extradata = avctx->extradata;
if (avctx->codec->id == CODEC_ID_WMAV1 && avctx->extradata_size >= 4) {
- flags1 = AV_RL16(extradata);
flags2 = AV_RL16(extradata+2);
} else if (avctx->codec->id == CODEC_ID_WMAV2 && avctx->extradata_size >= 6) {
- flags1 = AV_RL32(extradata);
flags2 = AV_RL16(extradata+4);
}
// for(i=0; i<avctx->extradata_size; i++)
}
if (s->use_exp_vlc) {
- init_vlc(&s->exp_vlc, EXPVLCBITS, sizeof(ff_wma_scale_huffbits), //FIXME move out of context
- ff_wma_scale_huffbits, 1, 1,
- ff_wma_scale_huffcodes, 4, 4, 0);
+ init_vlc(&s->exp_vlc, EXPVLCBITS, sizeof(ff_aac_scalefactor_bits), //FIXME move out of context
+ ff_aac_scalefactor_bits, 1, 1,
+ ff_aac_scalefactor_code, 4, 4, 0);
} else {
wma_lsp_to_curve_init(s, s->frame_len);
}
- avctx->sample_fmt = SAMPLE_FMT_S16;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
return 0;
}
s->block_len, lsp_coefs);
}
+/** pow(10, i / 16.0) for i in -60..95 */
+static const float pow_tab[] = {
+ 1.7782794100389e-04, 2.0535250264571e-04,
+ 2.3713737056617e-04, 2.7384196342644e-04,
+ 3.1622776601684e-04, 3.6517412725484e-04,
+ 4.2169650342858e-04, 4.8696752516586e-04,
+ 5.6234132519035e-04, 6.4938163157621e-04,
+ 7.4989420933246e-04, 8.6596432336006e-04,
+ 1.0000000000000e-03, 1.1547819846895e-03,
+ 1.3335214321633e-03, 1.5399265260595e-03,
+ 1.7782794100389e-03, 2.0535250264571e-03,
+ 2.3713737056617e-03, 2.7384196342644e-03,
+ 3.1622776601684e-03, 3.6517412725484e-03,
+ 4.2169650342858e-03, 4.8696752516586e-03,
+ 5.6234132519035e-03, 6.4938163157621e-03,
+ 7.4989420933246e-03, 8.6596432336006e-03,
+ 1.0000000000000e-02, 1.1547819846895e-02,
+ 1.3335214321633e-02, 1.5399265260595e-02,
+ 1.7782794100389e-02, 2.0535250264571e-02,
+ 2.3713737056617e-02, 2.7384196342644e-02,
+ 3.1622776601684e-02, 3.6517412725484e-02,
+ 4.2169650342858e-02, 4.8696752516586e-02,
+ 5.6234132519035e-02, 6.4938163157621e-02,
+ 7.4989420933246e-02, 8.6596432336007e-02,
+ 1.0000000000000e-01, 1.1547819846895e-01,
+ 1.3335214321633e-01, 1.5399265260595e-01,
+ 1.7782794100389e-01, 2.0535250264571e-01,
+ 2.3713737056617e-01, 2.7384196342644e-01,
+ 3.1622776601684e-01, 3.6517412725484e-01,
+ 4.2169650342858e-01, 4.8696752516586e-01,
+ 5.6234132519035e-01, 6.4938163157621e-01,
+ 7.4989420933246e-01, 8.6596432336007e-01,
+ 1.0000000000000e+00, 1.1547819846895e+00,
+ 1.3335214321633e+00, 1.5399265260595e+00,
+ 1.7782794100389e+00, 2.0535250264571e+00,
+ 2.3713737056617e+00, 2.7384196342644e+00,
+ 3.1622776601684e+00, 3.6517412725484e+00,
+ 4.2169650342858e+00, 4.8696752516586e+00,
+ 5.6234132519035e+00, 6.4938163157621e+00,
+ 7.4989420933246e+00, 8.6596432336007e+00,
+ 1.0000000000000e+01, 1.1547819846895e+01,
+ 1.3335214321633e+01, 1.5399265260595e+01,
+ 1.7782794100389e+01, 2.0535250264571e+01,
+ 2.3713737056617e+01, 2.7384196342644e+01,
+ 3.1622776601684e+01, 3.6517412725484e+01,
+ 4.2169650342858e+01, 4.8696752516586e+01,
+ 5.6234132519035e+01, 6.4938163157621e+01,
+ 7.4989420933246e+01, 8.6596432336007e+01,
+ 1.0000000000000e+02, 1.1547819846895e+02,
+ 1.3335214321633e+02, 1.5399265260595e+02,
+ 1.7782794100389e+02, 2.0535250264571e+02,
+ 2.3713737056617e+02, 2.7384196342644e+02,
+ 3.1622776601684e+02, 3.6517412725484e+02,
+ 4.2169650342858e+02, 4.8696752516586e+02,
+ 5.6234132519035e+02, 6.4938163157621e+02,
+ 7.4989420933246e+02, 8.6596432336007e+02,
+ 1.0000000000000e+03, 1.1547819846895e+03,
+ 1.3335214321633e+03, 1.5399265260595e+03,
+ 1.7782794100389e+03, 2.0535250264571e+03,
+ 2.3713737056617e+03, 2.7384196342644e+03,
+ 3.1622776601684e+03, 3.6517412725484e+03,
+ 4.2169650342858e+03, 4.8696752516586e+03,
+ 5.6234132519035e+03, 6.4938163157621e+03,
+ 7.4989420933246e+03, 8.6596432336007e+03,
+ 1.0000000000000e+04, 1.1547819846895e+04,
+ 1.3335214321633e+04, 1.5399265260595e+04,
+ 1.7782794100389e+04, 2.0535250264571e+04,
+ 2.3713737056617e+04, 2.7384196342644e+04,
+ 3.1622776601684e+04, 3.6517412725484e+04,
+ 4.2169650342858e+04, 4.8696752516586e+04,
+ 5.6234132519035e+04, 6.4938163157621e+04,
+ 7.4989420933246e+04, 8.6596432336007e+04,
+ 1.0000000000000e+05, 1.1547819846895e+05,
+ 1.3335214321633e+05, 1.5399265260595e+05,
+ 1.7782794100389e+05, 2.0535250264571e+05,
+ 2.3713737056617e+05, 2.7384196342644e+05,
+ 3.1622776601684e+05, 3.6517412725484e+05,
+ 4.2169650342858e+05, 4.8696752516586e+05,
+ 5.6234132519035e+05, 6.4938163157621e+05,
+ 7.4989420933246e+05, 8.6596432336007e+05,
+};
+
/**
* decode exponents coded with VLC codes
*/
static int decode_exp_vlc(WMACodecContext *s, int ch)
{
int last_exp, n, code;
- const uint16_t *ptr, *band_ptr;
- float v, *q, max_scale, *q_end;
-
- band_ptr = s->exponent_bands[s->frame_len_bits - s->block_len_bits];
- ptr = band_ptr;
- q = s->exponents[ch];
+ const uint16_t *ptr;
+ float v, max_scale;
+ uint32_t *q, *q_end, iv;
+ const float *ptab = pow_tab + 60;
+ const uint32_t *iptab = (const uint32_t*)ptab;
+
+ ptr = s->exponent_bands[s->frame_len_bits - s->block_len_bits];
+ q = (uint32_t *)s->exponents[ch];
q_end = q + s->block_len;
max_scale = 0;
if (s->version == 1) {
last_exp = get_bits(&s->gb, 5) + 10;
- /* XXX: use a table */
- v = pow(10, last_exp * (1.0 / 16.0));
+ v = ptab[last_exp];
+ iv = iptab[last_exp];
max_scale = v;
n = *ptr++;
- do {
- *q++ = v;
- } while (--n);
+ switch (n & 3) do {
+ case 0: *q++ = iv;
+ case 3: *q++ = iv;
+ case 2: *q++ = iv;
+ case 1: *q++ = iv;
+ } while ((n -= 4) > 0);
}else
last_exp = 36;
while (q < q_end) {
code = get_vlc2(&s->gb, s->exp_vlc.table, EXPVLCBITS, EXPMAX);
- if (code < 0)
+ if (code < 0){
+ av_log(s->avctx, AV_LOG_ERROR, "Exponent vlc invalid\n");
return -1;
+ }
/* NOTE: this offset is the same as MPEG4 AAC ! */
last_exp += code - 60;
- /* XXX: use a table */
- v = pow(10, last_exp * (1.0 / 16.0));
+ if ((unsigned)last_exp + 60 > FF_ARRAY_ELEMS(pow_tab)) {
+ av_log(s->avctx, AV_LOG_ERROR, "Exponent out of range: %d\n",
+ last_exp);
+ return -1;
+ }
+ v = ptab[last_exp];
+ iv = iptab[last_exp];
if (v > max_scale)
max_scale = v;
n = *ptr++;
- do {
- *q++ = v;
- } while (--n);
+ switch (n & 3) do {
+ case 0: *q++ = iv;
+ case 3: *q++ = iv;
+ case 2: *q++ = iv;
+ case 1: *q++ = iv;
+ } while ((n -= 4) > 0);
}
s->max_exponent[ch] = max_scale;
return 0;
block_len = s->block_len;
bsize = s->frame_len_bits - s->block_len_bits;
- s->dsp.vector_fmul_add_add(out, in, s->windows[bsize],
- out, 0, block_len, 1);
+ s->dsp.vector_fmul_add(out, in, s->windows[bsize],
+ out, block_len);
} else {
block_len = 1 << s->prev_block_len_bits;
n = (s->block_len - block_len) / 2;
bsize = s->frame_len_bits - s->prev_block_len_bits;
- s->dsp.vector_fmul_add_add(out+n, in+n, s->windows[bsize],
- out+n, 0, block_len, 1);
+ s->dsp.vector_fmul_add(out+n, in+n, s->windows[bsize],
+ out+n, block_len);
memcpy(out+n+block_len, in+n+block_len, n*sizeof(float));
}
if (s->reset_block_lengths) {
s->reset_block_lengths = 0;
v = get_bits(&s->gb, n);
- if (v >= s->nb_block_sizes)
+ if (v >= s->nb_block_sizes){
+ av_log(s->avctx, AV_LOG_ERROR, "prev_block_len_bits %d out of range\n", s->frame_len_bits - v);
return -1;
+ }
s->prev_block_len_bits = s->frame_len_bits - v;
v = get_bits(&s->gb, n);
- if (v >= s->nb_block_sizes)
+ if (v >= s->nb_block_sizes){
+ av_log(s->avctx, AV_LOG_ERROR, "block_len_bits %d out of range\n", s->frame_len_bits - v);
return -1;
+ }
s->block_len_bits = s->frame_len_bits - v;
} else {
/* update block lengths */
s->block_len_bits = s->next_block_len_bits;
}
v = get_bits(&s->gb, n);
- if (v >= s->nb_block_sizes)
+ if (v >= s->nb_block_sizes){
+ av_log(s->avctx, AV_LOG_ERROR, "next_block_len_bits %d out of range\n", s->frame_len_bits - v);
return -1;
+ }
s->next_block_len_bits = s->frame_len_bits - v;
} else {
/* fixed block len */
/* now check if the block length is coherent with the frame length */
s->block_len = 1 << s->block_len_bits;
- if ((s->block_pos + s->block_len) > s->frame_len)
+ if ((s->block_pos + s->block_len) > s->frame_len){
+ av_log(s->avctx, AV_LOG_ERROR, "frame_len overflow\n");
return -1;
+ }
if (s->nb_channels == 2) {
s->ms_stereo = get_bits1(&s->gb);
val = get_bits(&s->gb, 7) - 19;
} else {
code = get_vlc2(&s->gb, s->hgain_vlc.table, HGAINVLCBITS, HGAINMAX);
- if (code < 0)
+ if (code < 0){
+ av_log(s->avctx, AV_LOG_ERROR, "hgain vlc invalid\n");
return -1;
+ }
val += code - 18;
}
s->high_band_values[ch][i] = val;
/* compute power of high bands */
exponents = s->exponents[ch] +
- (s->high_band_start[bsize]<<bsize);
+ (s->high_band_start[bsize]<<bsize>>esize);
last_high_band = 0; /* avoid warning */
for(j=0;j<n1;j++) {
n = s->exponent_high_bands[s->frame_len_bits -
last_high_band = j;
tprintf(s->avctx, "%d: power=%f (%d)\n", j, exp_power[j], n);
}
- exponents += n<<bsize;
+ exponents += n<<bsize>>esize;
}
/* main freqs and high freqs */
- exponents = s->exponents[ch] + (s->coefs_start<<bsize);
+ exponents = s->exponents[ch] + (s->coefs_start<<bsize>>esize);
for(j=-1;j<n1;j++) {
if (j < 0) {
n = s->high_band_start[bsize] -
*coefs++ = noise *
exponents[i<<bsize>>esize] * mult1;
}
- exponents += n<<bsize;
+ exponents += n<<bsize>>esize;
} else {
/* coded values + small noise */
for(i = 0;i < n; i++) {
*coefs++ = ((*coefs1++) + noise) *
exponents[i<<bsize>>esize] * mult;
}
- exponents += n<<bsize;
+ exponents += n<<bsize>>esize;
}
}
#endif
if (s->ms_stereo && s->channel_coded[1]) {
- float a, b;
- int i;
-
/* nominal case for ms stereo: we do it before mdct */
/* no need to optimize this case because it should almost
never happen */
s->channel_coded[0] = 1;
}
- for(i = 0; i < s->block_len; i++) {
- a = s->coefs[0][i];
- b = s->coefs[1][i];
- s->coefs[0][i] = a + b;
- s->coefs[1][i] = a - b;
- }
+ s->dsp.butterflies_float(s->coefs[0], s->coefs[1], s->block_len);
}
next:
/* convert frame to integer */
n = s->frame_len;
incr = s->nb_channels;
- for(ch = 0; ch < s->nb_channels; ch++) {
- ptr = samples + ch;
- iptr = s->frame_out[ch];
+ if (s->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) {
+ for(ch = 0; ch < s->nb_channels; ch++) {
+ ptr = samples + ch;
+ iptr = s->frame_out[ch];
- for(i=0;i<n;i++) {
- *ptr = av_clip_int16(lrintf(*iptr++));
- ptr += incr;
+ for(i=0;i<n;i++) {
+ *ptr = av_clip_int16(lrintf(*iptr++));
+ ptr += incr;
+ }
+ /* prepare for next block */
+ memmove(&s->frame_out[ch][0], &s->frame_out[ch][s->frame_len],
+ s->frame_len * sizeof(float));
+ }
+ } else {
+ const float *output[MAX_CHANNELS];
+ for (ch = 0; ch < MAX_CHANNELS; ch++)
+ output[ch] = s->frame_out[ch];
+ s->dsp.float_to_int16_interleave(samples, output, n, incr);
+ for(ch = 0; ch < incr; ch++) {
+ /* prepare for next block */
+ memmove(&s->frame_out[ch][0], &s->frame_out[ch][n], n * sizeof(float));
}
- /* prepare for next block */
- memmove(&s->frame_out[ch][0], &s->frame_out[ch][s->frame_len],
- s->frame_len * sizeof(float));
}
#ifdef TRACE
pos >>= 3;
len = buf_size - pos;
if (len > MAX_CODED_SUPERFRAME_SIZE || len < 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "len %d invalid\n", len);
goto fail;
}
s->last_superframe_len = len;
return -1;
}
+static av_cold void flush(AVCodecContext *avctx)
+{
+ WMACodecContext *s = avctx->priv_data;
+
+ s->last_bitoffset=
+ s->last_superframe_len= 0;
+}
+
AVCodec wmav1_decoder =
{
"wmav1",
- CODEC_TYPE_AUDIO,
+ AVMEDIA_TYPE_AUDIO,
CODEC_ID_WMAV1,
sizeof(WMACodecContext),
wma_decode_init,
NULL,
ff_wma_end,
wma_decode_superframe,
+ .flush=flush,
.long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"),
};
AVCodec wmav2_decoder =
{
"wmav2",
- CODEC_TYPE_AUDIO,
+ AVMEDIA_TYPE_AUDIO,
CODEC_ID_WMAV2,
sizeof(WMACodecContext),
wma_decode_init,
NULL,
ff_wma_end,
wma_decode_superframe,
+ .flush=flush,
.long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
};