X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fwmadec.c;h=fcbac931f9113a9f459f92c610df5c8f699ba259;hb=5c1585c4c3b5281835d784c5daef0069915ccd57;hp=78ada71466b585255b5bbc9f0c9cc50865059e2f;hpb=9c6cf7f2c9d326281e3eefa67673aabaa9d69940;p=ffmpeg diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 78ada71466b..fcbac931f91 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -33,79 +33,71 @@ * should be 4 extra bytes for v1 data and 6 extra bytes for v2 data. */ +#include "libavutil/attributes.h" + #include "avcodec.h" +#include "bitstream.h" +#include "internal.h" #include "wma.h" -#undef NDEBUG -#include - #define EXPVLCBITS 8 -#define EXPMAX ((19+EXPVLCBITS-1)/EXPVLCBITS) +#define EXPMAX ((19 + EXPVLCBITS - 1) / EXPVLCBITS) #define HGAINVLCBITS 9 -#define HGAINMAX ((13+HGAINVLCBITS-1)/HGAINVLCBITS) +#define HGAINMAX ((13 + HGAINVLCBITS - 1) / HGAINVLCBITS) static void wma_lsp_to_curve_init(WMACodecContext *s, int frame_len); #ifdef TRACE -static void dump_shorts(WMACodecContext *s, const char *name, const short *tab, int n) -{ - int i; - - tprintf(s->avctx, "%s[%d]:\n", name, n); - for(i=0;iavctx, "%4d: ", i); - tprintf(s->avctx, " %5d.0", tab[i]); - if ((i & 7) == 7) - tprintf(s->avctx, "\n"); - } -} - -static void dump_floats(WMACodecContext *s, const char *name, int prec, const float *tab, int n) +static void dump_floats(WMACodecContext *s, const char *name, + int prec, const float *tab, int n) { int i; - tprintf(s->avctx, "%s[%d]:\n", name, n); - for(i=0;iavctx, "%s[%d]:\n", name, n); + for (i = 0; i < n; i++) { if ((i & 7) == 0) - tprintf(s->avctx, "%4d: ", i); - tprintf(s->avctx, " %8.*f", prec, tab[i]); + ff_tlog(s->avctx, "%4d: ", i); + ff_tlog(s->avctx, " %8.*f", prec, tab[i]); if ((i & 7) == 7) - tprintf(s->avctx, "\n"); + ff_tlog(s->avctx, "\n"); } if ((i & 7) != 0) - tprintf(s->avctx, "\n"); + ff_tlog(s->avctx, "\n"); } -#endif +#endif /* TRACE */ -static int wma_decode_init(AVCodecContext * avctx) +static av_cold int wma_decode_init(AVCodecContext *avctx) { WMACodecContext *s = avctx->priv_data; int i, flags2; uint8_t *extradata; + if (!avctx->block_align) { + av_log(avctx, AV_LOG_ERROR, "block_align is not set\n"); + return AVERROR(EINVAL); + } + s->avctx = avctx; - /* extract flag infos */ - flags2 = 0; + /* extract flag info */ + flags2 = 0; extradata = avctx->extradata; - if (avctx->codec->id == AV_CODEC_ID_WMAV1 && avctx->extradata_size >= 4) { - flags2 = AV_RL16(extradata+2); - } else if (avctx->codec->id == AV_CODEC_ID_WMAV2 && avctx->extradata_size >= 6) { - flags2 = AV_RL16(extradata+4); - } + if (avctx->codec->id == AV_CODEC_ID_WMAV1 && avctx->extradata_size >= 4) + flags2 = AV_RL16(extradata + 2); + else if (avctx->codec->id == AV_CODEC_ID_WMAV2 && avctx->extradata_size >= 6) + flags2 = AV_RL16(extradata + 4); - s->use_exp_vlc = flags2 & 0x0001; - s->use_bit_reservoir = flags2 & 0x0002; + s->use_exp_vlc = flags2 & 0x0001; + s->use_bit_reservoir = flags2 & 0x0002; s->use_variable_block_len = flags2 & 0x0004; - if(ff_wma_init(avctx, flags2)<0) + if (ff_wma_init(avctx, flags2) < 0) return -1; /* init MDCT */ - for(i = 0; i < s->nb_block_sizes; i++) - ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 1, 1.0); + for (i = 0; i < s->nb_block_sizes; i++) + ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 1, 1.0 / 32768.0); if (s->use_noise_coding) { init_vlc(&s->hgain_vlc, HGAINVLCBITS, sizeof(ff_wma_hgain_huffbits), @@ -113,18 +105,14 @@ static int wma_decode_init(AVCodecContext * avctx) ff_wma_hgain_huffcodes, 2, 2, 0); } - if (s->use_exp_vlc) { - init_vlc(&s->exp_vlc, EXPVLCBITS, sizeof(ff_aac_scalefactor_bits), //FIXME move out of context + if (s->use_exp_vlc) + 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 { + else wma_lsp_to_curve_init(s, s->frame_len); - } - - avctx->sample_fmt = AV_SAMPLE_FMT_S16; - avcodec_get_frame_defaults(&s->frame); - avctx->coded_frame = &s->frame; + avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; return 0; } @@ -145,40 +133,40 @@ static inline float pow_m1_4(WMACodecContext *s, float x) float a, b; u.f = x; - e = u.v >> 23; - m = (u.v >> (23 - LSP_POW_BITS)) & ((1 << LSP_POW_BITS) - 1); + e = u.v >> 23; + m = (u.v >> (23 - LSP_POW_BITS)) & ((1 << LSP_POW_BITS) - 1); /* build interpolation scale: 1 <= t < 2. */ t.v = ((u.v << LSP_POW_BITS) & ((1 << 23) - 1)) | (127 << 23); - a = s->lsp_pow_m_table1[m]; - b = s->lsp_pow_m_table2[m]; + a = s->lsp_pow_m_table1[m]; + b = s->lsp_pow_m_table2[m]; return s->lsp_pow_e_table[e] * (a + b * t.f); } -static void wma_lsp_to_curve_init(WMACodecContext *s, int frame_len) +static av_cold void wma_lsp_to_curve_init(WMACodecContext *s, int frame_len) { float wdel, a, b; int i, e, m; wdel = M_PI / frame_len; - for(i=0;ilsp_cos_table[i] = 2.0f * cos(wdel * i); /* tables for x^-0.25 computation */ - for(i=0;i<256;i++) { - e = i - 126; + for (i = 0; i < 256; i++) { + e = i - 126; s->lsp_pow_e_table[i] = pow(2.0, e * -0.25); } /* NOTE: these two tables are needed to avoid two operations in - pow_m1_4 */ + * pow_m1_4 */ b = 1.0; - for(i=(1 << LSP_POW_BITS) - 1;i>=0;i--) { - m = (1 << LSP_POW_BITS) + i; - a = (float)m * (0.5 / (1 << LSP_POW_BITS)); - a = pow(a, -0.25); + for (i = (1 << LSP_POW_BITS) - 1; i >= 0; i--) { + m = (1 << LSP_POW_BITS) + i; + a = (float) m * (0.5 / (1 << LSP_POW_BITS)); + a = pow(a, -0.25); s->lsp_pow_m_table1[i] = 2 * a - b; s->lsp_pow_m_table2[i] = b - a; - b = a; + b = a; } } @@ -186,26 +174,25 @@ static void wma_lsp_to_curve_init(WMACodecContext *s, int frame_len) * NOTE: We use the same code as Vorbis here * @todo optimize it further with SSE/3Dnow */ -static void wma_lsp_to_curve(WMACodecContext *s, - float *out, float *val_max_ptr, +static void wma_lsp_to_curve(WMACodecContext *s, float *out, float *val_max_ptr, int n, float *lsp) { int i, j; float p, q, w, v, val_max; val_max = 0; - for(i=0;ilsp_cos_table[i]; - for(j=1;j val_max) val_max = v; out[i] = v; @@ -221,11 +208,11 @@ static void decode_exp_lsp(WMACodecContext *s, int ch) float lsp_coefs[NB_LSP_COEFS]; int val, i; - for(i = 0; i < NB_LSP_COEFS; i++) { + for (i = 0; i < NB_LSP_COEFS; i++) { if (i == 0 || i >= 8) - val = get_bits(&s->gb, 3); + val = bitstream_read(&s->bc, 3); else - val = get_bits(&s->gb, 4); + val = bitstream_read(&s->bc, 4); lsp_coefs[i] = ff_wma_lsp_codebook[i][val]; } @@ -325,41 +312,41 @@ static int decode_exp_vlc(WMACodecContext *s, int ch) float v, max_scale; uint32_t *q, *q_end, iv; const float *ptab = pow_tab + 60; - const uint32_t *iptab = (const uint32_t*)ptab; + 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; + 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; - v = ptab[last_exp]; - iv = iptab[last_exp]; + last_exp = bitstream_read(&s->bc, 5) + 10; + v = ptab[last_exp]; + iv = iptab[last_exp]; max_scale = v; - n = *ptr++; + n = *ptr++; 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 + } else last_exp = 36; while (q < q_end) { - code = get_vlc2(&s->gb, s->exp_vlc.table, EXPVLCBITS, EXPMAX); - if (code < 0){ + code = bitstream_read_vlc(&s->bc, s->exp_vlc.table, EXPVLCBITS, EXPMAX); + 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 ! */ + /* NOTE: this offset is the same as MPEG-4 AAC! */ last_exp += code - 60; - if ((unsigned)last_exp + 60 >= FF_ARRAY_ELEMS(pow_tab)) { + 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]; + v = ptab[last_exp]; iv = iptab[last_exp]; if (v > max_scale) max_scale = v; @@ -375,7 +362,6 @@ static int decode_exp_vlc(WMACodecContext *s, int ch) return 0; } - /** * Apply MDCT window and add into output. * @@ -390,49 +376,47 @@ static void wma_window(WMACodecContext *s, float *out) /* left part */ if (s->block_len_bits <= s->prev_block_len_bits) { block_len = s->block_len; - bsize = s->frame_len_bits - s->block_len_bits; - - s->dsp.vector_fmul_add(out, in, s->windows[bsize], - out, block_len); + bsize = s->frame_len_bits - s->block_len_bits; + s->fdsp.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; + n = (s->block_len - block_len) / 2; + bsize = s->frame_len_bits - s->prev_block_len_bits; - s->dsp.vector_fmul_add(out+n, in+n, s->windows[bsize], - out+n, block_len); + s->fdsp.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)); + memcpy(out + n + block_len, in + n + block_len, n * sizeof(float)); } out += s->block_len; - in += s->block_len; + in += s->block_len; /* right part */ if (s->block_len_bits <= s->next_block_len_bits) { block_len = s->block_len; - bsize = s->frame_len_bits - s->block_len_bits; - - s->dsp.vector_fmul_reverse(out, in, s->windows[bsize], block_len); + bsize = s->frame_len_bits - s->block_len_bits; + s->fdsp.vector_fmul_reverse(out, in, s->windows[bsize], block_len); } else { block_len = 1 << s->next_block_len_bits; - n = (s->block_len - block_len) / 2; - bsize = s->frame_len_bits - s->next_block_len_bits; + n = (s->block_len - block_len) / 2; + bsize = s->frame_len_bits - s->next_block_len_bits; - memcpy(out, in, n*sizeof(float)); + memcpy(out, in, n * sizeof(float)); - s->dsp.vector_fmul_reverse(out+n, in+n, s->windows[bsize], block_len); + s->fdsp.vector_fmul_reverse(out + n, in + n, s->windows[bsize], + block_len); - memset(out+n+block_len, 0, n*sizeof(float)); + memset(out + n + block_len, 0, n * sizeof(float)); } } - /** * @return 0 if OK. 1 if last block of frame. return -1 if - * unrecorrable error. + * unrecoverable error. */ static int wma_decode_block(WMACodecContext *s) { @@ -443,8 +427,9 @@ static int wma_decode_block(WMACodecContext *s) FFTContext *mdct; #ifdef TRACE - tprintf(s->avctx, "***decode_block: %d:%d\n", s->frame_count - 1, s->block_num); -#endif + ff_tlog(s->avctx, "***decode_block: %d:%d\n", + s->frame_count - 1, s->block_num); +#endif /* TRACE */ /* compute current block length */ if (s->use_variable_block_len) { @@ -452,26 +437,32 @@ static int wma_decode_block(WMACodecContext *s) if (s->reset_block_lengths) { s->reset_block_lengths = 0; - v = get_bits(&s->gb, n); - 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); + v = bitstream_read(&s->bc, n); + 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){ - av_log(s->avctx, AV_LOG_ERROR, "block_len_bits %d out of range\n", s->frame_len_bits - v); + v = bitstream_read(&s->bc, n); + 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->prev_block_len_bits = s->block_len_bits; - s->block_len_bits = s->next_block_len_bits; + s->block_len_bits = s->next_block_len_bits; } - v = get_bits(&s->gb, n); - 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); + v = bitstream_read(&s->bc, n); + 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; @@ -479,24 +470,23 @@ static int wma_decode_block(WMACodecContext *s) /* fixed block len */ s->next_block_len_bits = s->frame_len_bits; s->prev_block_len_bits = s->frame_len_bits; - s->block_len_bits = s->frame_len_bits; + s->block_len_bits = s->frame_len_bits; } /* 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); - } + if (s->avctx->channels == 2) + s->ms_stereo = bitstream_read_bit(&s->bc); v = 0; - for(ch = 0; ch < s->nb_channels; ch++) { - a = get_bits1(&s->gb); + for (ch = 0; ch < s->avctx->channels; ch++) { + a = bitstream_read_bit(&s->bc); s->channel_coded[ch] = a; - v |= a; + v |= a; } bsize = s->frame_len_bits - s->block_len_bits; @@ -507,31 +497,30 @@ static int wma_decode_block(WMACodecContext *s) goto next; /* read total gain and extract corresponding number of bits for - coef escape coding */ + * coef escape coding */ total_gain = 1; - for(;;) { - a = get_bits(&s->gb, 7); + for (;;) { + a = bitstream_read(&s->bc, 7); total_gain += a; if (a != 127) break; } - coef_nb_bits= ff_wma_total_gain_to_bits(total_gain); + coef_nb_bits = ff_wma_total_gain_to_bits(total_gain); /* compute number of coefficients */ n = s->coefs_end[bsize] - s->coefs_start; - for(ch = 0; ch < s->nb_channels; ch++) + for (ch = 0; ch < s->avctx->channels; ch++) nb_coefs[ch] = n; /* complex coding */ if (s->use_noise_coding) { - - for(ch = 0; ch < s->nb_channels; ch++) { + for (ch = 0; ch < s->avctx->channels; ch++) { if (s->channel_coded[ch]) { int i, n, a; n = s->exponent_high_sizes[bsize]; - for(i=0;igb); + for (i = 0; i < n; i++) { + a = bitstream_read_bit(&s->bc); s->high_band_coded[ch][i] = a; /* if noise coding, the coefficients are not transmitted */ if (a) @@ -539,20 +528,23 @@ static int wma_decode_block(WMACodecContext *s) } } } - for(ch = 0; ch < s->nb_channels; ch++) { + for (ch = 0; ch < s->avctx->channels; ch++) { if (s->channel_coded[ch]) { int i, n, val, code; - n = s->exponent_high_sizes[bsize]; - val = (int)0x80000000; - for(i=0;iexponent_high_sizes[bsize]; + val = (int) 0x80000000; + for (i = 0; i < n; i++) { if (s->high_band_coded[ch][i]) { - if (val == (int)0x80000000) { - val = get_bits(&s->gb, 7) - 19; + if (val == (int) 0x80000000) { + val = bitstream_read(&s->bc, 7) - 19; } else { - code = get_vlc2(&s->gb, s->hgain_vlc.table, HGAINVLCBITS, HGAINMAX); - if (code < 0){ - av_log(s->avctx, AV_LOG_ERROR, "hgain vlc invalid\n"); + code = bitstream_read_vlc(&s->bc, + s->hgain_vlc.table, + HGAINVLCBITS, HGAINMAX); + if (code < 0) { + av_log(s->avctx, AV_LOG_ERROR, + "hgain vlc invalid\n"); return -1; } val += code - 18; @@ -565,9 +557,8 @@ static int wma_decode_block(WMACodecContext *s) } /* exponents can be reused in short blocks. */ - if ((s->block_len_bits == s->frame_len_bits) || - get_bits1(&s->gb)) { - for(ch = 0; ch < s->nb_channels; ch++) { + if ((s->block_len_bits == s->frame_len_bits) || bitstream_read_bit(&s->bc)) { + for (ch = 0; ch < s->avctx->channels; ch++) { if (s->channel_coded[ch]) { if (s->use_exp_vlc) { if (decode_exp_vlc(s, ch) < 0) @@ -581,170 +572,165 @@ static int wma_decode_block(WMACodecContext *s) } /* parse spectral coefficients : just RLE encoding */ - for(ch = 0; ch < s->nb_channels; ch++) { + for (ch = 0; ch < s->avctx->channels; ch++) { if (s->channel_coded[ch]) { int tindex; - WMACoef* ptr = &s->coefs1[ch][0]; + WMACoef *ptr = &s->coefs1[ch][0]; /* special VLC tables are used for ms stereo because - there is potentially less energy there */ + * there is potentially less energy there */ tindex = (ch == 1 && s->ms_stereo); memset(ptr, 0, s->block_len * sizeof(WMACoef)); - ff_wma_run_level_decode(s->avctx, &s->gb, &s->coef_vlc[tindex], - s->level_table[tindex], s->run_table[tindex], - 0, ptr, 0, nb_coefs[ch], - s->block_len, s->frame_len_bits, coef_nb_bits); - } - if (s->version == 1 && s->nb_channels >= 2) { - align_get_bits(&s->gb); + ff_wma_run_level_decode(s->avctx, &s->bc, &s->coef_vlc[tindex], + s->level_table[tindex], s->run_table[tindex], + 0, ptr, 0, nb_coefs[ch], + s->block_len, s->frame_len_bits, coef_nb_bits); } + if (s->version == 1 && s->avctx->channels >= 2) + bitstream_align(&s->bc); } /* normalize */ { int n4 = s->block_len / 2; - mdct_norm = 1.0 / (float)n4; - if (s->version == 1) { + mdct_norm = 1.0 / (float) n4; + if (s->version == 1) mdct_norm *= sqrt(n4); - } } /* finally compute the MDCT coefficients */ - for(ch = 0; ch < s->nb_channels; ch++) { + for (ch = 0; ch < s->avctx->channels; ch++) { if (s->channel_coded[ch]) { WMACoef *coefs1; float *coefs, *exponents, mult, mult1, noise; int i, j, n, n1, last_high_band, esize; float exp_power[HIGH_BAND_MAX_SIZE]; - coefs1 = s->coefs1[ch]; + coefs1 = s->coefs1[ch]; exponents = s->exponents[ch]; - esize = s->exponents_bsize[ch]; - mult = pow(10, total_gain * 0.05) / s->max_exponent[ch]; - mult *= mdct_norm; - coefs = s->coefs[ch]; + esize = s->exponents_bsize[ch]; + mult = pow(10, total_gain * 0.05) / s->max_exponent[ch]; + mult *= mdct_norm; + coefs = s->coefs[ch]; if (s->use_noise_coding) { mult1 = mult; /* very low freqs : noise */ - for(i = 0;i < s->coefs_start; i++) { + for (i = 0; i < s->coefs_start; i++) { *coefs++ = s->noise_table[s->noise_index] * - exponents[i<>esize] * mult1; - s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1); + exponents[i << bsize >> esize] * mult1; + s->noise_index = (s->noise_index + 1) & + (NOISE_TAB_SIZE - 1); } n1 = s->exponent_high_sizes[bsize]; /* compute power of high bands */ exponents = s->exponents[ch] + - (s->high_band_start[bsize]<>esize); + (s->high_band_start[bsize] << bsize >> esize); last_high_band = 0; /* avoid warning */ - for(j=0;jexponent_high_bands[s->frame_len_bits - - s->block_len_bits][j]; + s->block_len_bits][j]; if (s->high_band_coded[ch][j]) { float e2, v; e2 = 0; - for(i = 0;i < n; i++) { - v = exponents[i<>esize]; + for (i = 0; i < n; i++) { + v = exponents[i << bsize >> esize]; e2 += v * v; } - exp_power[j] = e2 / n; + exp_power[j] = e2 / n; last_high_band = j; - tprintf(s->avctx, "%d: power=%f (%d)\n", j, exp_power[j], n); + ff_tlog(s->avctx, "%d: power=%f (%d)\n", j, exp_power[j], n); } - exponents += n<>esize; + exponents += n << bsize >> esize; } /* main freqs and high freqs */ - exponents = s->exponents[ch] + (s->coefs_start<>esize); - for(j=-1;jhigh_band_start[bsize] - - s->coefs_start; - } else { + exponents = s->exponents[ch] + (s->coefs_start << bsize >> esize); + for (j = -1; j < n1; j++) { + if (j < 0) + n = s->high_band_start[bsize] - s->coefs_start; + else n = s->exponent_high_bands[s->frame_len_bits - - s->block_len_bits][j]; - } + s->block_len_bits][j]; if (j >= 0 && s->high_band_coded[ch][j]) { /* use noise with specified power */ mult1 = sqrt(exp_power[j] / exp_power[last_high_band]); /* XXX: use a table */ - mult1 = mult1 * pow(10, s->high_band_values[ch][j] * 0.05); - mult1 = mult1 / (s->max_exponent[ch] * s->noise_mult); + mult1 = mult1 * pow(10, s->high_band_values[ch][j] * 0.05); + mult1 = mult1 / (s->max_exponent[ch] * s->noise_mult); mult1 *= mdct_norm; - for(i = 0;i < n; i++) { - noise = s->noise_table[s->noise_index]; + for (i = 0; i < n; i++) { + noise = s->noise_table[s->noise_index]; s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1); - *coefs++ = noise * - exponents[i<>esize] * mult1; + *coefs++ = noise * exponents[i << bsize >> esize] * mult1; } - exponents += n<>esize; + exponents += n << bsize >> esize; } else { /* coded values + small noise */ - for(i = 0;i < n; i++) { - noise = s->noise_table[s->noise_index]; + for (i = 0; i < n; i++) { + noise = s->noise_table[s->noise_index]; s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1); - *coefs++ = ((*coefs1++) + noise) * - exponents[i<>esize] * mult; + *coefs++ = ((*coefs1++) + noise) * + exponents[i << bsize >> esize] * mult; } - exponents += n<>esize; + exponents += n << bsize >> esize; } } /* very high freqs : noise */ - n = s->block_len - s->coefs_end[bsize]; - mult1 = mult * exponents[((-1<>esize]; - for(i = 0; i < n; i++) { - *coefs++ = s->noise_table[s->noise_index] * mult1; + n = s->block_len - s->coefs_end[bsize]; + mult1 = mult * exponents[((-1 << bsize)) >> esize]; + for (i = 0; i < n; i++) { + *coefs++ = s->noise_table[s->noise_index] * mult1; s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1); } } else { /* XXX: optimize more */ - for(i = 0;i < s->coefs_start; i++) + for (i = 0; i < s->coefs_start; i++) *coefs++ = 0.0; n = nb_coefs[ch]; - for(i = 0;i < n; i++) { - *coefs++ = coefs1[i] * exponents[i<>esize] * mult; - } + for (i = 0; i < n; i++) + *coefs++ = coefs1[i] * exponents[i << bsize >> esize] * mult; n = s->block_len - s->coefs_end[bsize]; - for(i = 0;i < n; i++) + for (i = 0; i < n; i++) *coefs++ = 0.0; } } } #ifdef TRACE - for(ch = 0; ch < s->nb_channels; ch++) { + for (ch = 0; ch < s->avctx->channels; ch++) { if (s->channel_coded[ch]) { dump_floats(s, "exponents", 3, s->exponents[ch], s->block_len); dump_floats(s, "coefs", 1, s->coefs[ch], s->block_len); } } -#endif +#endif /* TRACE */ if (s->ms_stereo && s->channel_coded[1]) { /* nominal case for ms stereo: we do it before mdct */ /* no need to optimize this case because it should almost - never happen */ + * never happen */ if (!s->channel_coded[0]) { - tprintf(s->avctx, "rare ms-stereo case happened\n"); + ff_tlog(s->avctx, "rare ms-stereo case happened\n"); memset(s->coefs[0], 0, sizeof(float) * s->block_len); s->channel_coded[0] = 1; } - s->dsp.butterflies_float(s->coefs[0], s->coefs[1], s->block_len); + s->fdsp.butterflies_float(s->coefs[0], s->coefs[1], s->block_len); } next: mdct = &s->mdct_ctx[bsize]; - for(ch = 0; ch < s->nb_channels; ch++) { + for (ch = 0; ch < s->avctx->channels; ch++) { int n4, index; n4 = s->block_len / 2; - if(s->channel_coded[ch]){ + if (s->channel_coded[ch]) mdct->imdct_calc(mdct, s->output, s->coefs[ch]); - }else if(!(s->ms_stereo && ch==1)) + else if (!(s->ms_stereo && ch == 1)) memset(s->output, 0, sizeof(s->output)); /* multiply by the window and add in the frame */ @@ -762,19 +748,20 @@ next: } /* decode a frame of frame_len samples */ -static int wma_decode_frame(WMACodecContext *s, int16_t *samples) +static int wma_decode_frame(WMACodecContext *s, float **samples, + int samples_offset) { - int ret, n, ch, incr; - const float *output[MAX_CHANNELS]; + int ret, ch; #ifdef TRACE - tprintf(s->avctx, "***decode_frame: %d size=%d\n", s->frame_count++, s->frame_len); -#endif + ff_tlog(s->avctx, "***decode_frame: %d size=%d\n", + s->frame_count++, s->frame_len); +#endif /* TRACE */ /* read each block */ s->block_num = 0; s->block_pos = 0; - for(;;) { + for (;;) { ret = wma_decode_block(s); if (ret < 0) return -1; @@ -782,71 +769,73 @@ static int wma_decode_frame(WMACodecContext *s, int16_t *samples) break; } - /* convert frame to integer */ - n = s->frame_len; - incr = s->nb_channels; - for (ch = 0; ch < MAX_CHANNELS; ch++) - output[ch] = s->frame_out[ch]; - s->fmt_conv.float_to_int16_interleave(samples, output, n, incr); - for (ch = 0; ch < incr; ch++) { + for (ch = 0; ch < s->avctx->channels; ch++) { + /* copy current block to output */ + memcpy(samples[ch] + samples_offset, s->frame_out[ch], + s->frame_len * sizeof(*s->frame_out[ch])); /* prepare for next block */ - memmove(&s->frame_out[ch][0], &s->frame_out[ch][n], n * sizeof(float)); - } + memmove(&s->frame_out[ch][0], &s->frame_out[ch][s->frame_len], + s->frame_len * sizeof(*s->frame_out[ch])); #ifdef TRACE - dump_shorts(s, "samples", samples, n * s->nb_channels); -#endif + dump_floats(s, "samples", 6, samples[ch] + samples_offset, + s->frame_len); +#endif /* TRACE */ + } + return 0; } static int wma_decode_superframe(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { + AVFrame *frame = data; const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; + int buf_size = avpkt->size; WMACodecContext *s = avctx->priv_data; int nb_frames, bit_offset, i, pos, len, ret; uint8_t *q; - int16_t *samples; + float **samples; + int samples_offset; - tprintf(avctx, "***decode_superframe:\n"); + ff_tlog(avctx, "***decode_superframe:\n"); - if(buf_size==0){ + if (buf_size == 0) { s->last_superframe_len = 0; return 0; } - if (buf_size < s->block_align) { + if (buf_size < avctx->block_align) { av_log(avctx, AV_LOG_ERROR, "Input packet size too small (%d < %d)\n", - buf_size, s->block_align); + buf_size, avctx->block_align); return AVERROR_INVALIDDATA; } - buf_size = s->block_align; + buf_size = avctx->block_align; - init_get_bits(&s->gb, buf, buf_size*8); + bitstream_init8(&s->bc, buf, buf_size); if (s->use_bit_reservoir) { /* read super frame header */ - skip_bits(&s->gb, 4); /* super frame index */ - nb_frames = get_bits(&s->gb, 4) - (s->last_superframe_len <= 0); - } else { + bitstream_skip(&s->bc, 4); /* super frame index */ + nb_frames = bitstream_read(&s->bc, 4) - (s->last_superframe_len <= 0); + } else nb_frames = 1; - } /* get output buffer */ - s->frame.nb_samples = nb_frames * s->frame_len; - if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) { + frame->nb_samples = nb_frames * s->frame_len; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - samples = (int16_t *)s->frame.data[0]; + samples = (float **) frame->extended_data; + samples_offset = 0; if (s->use_bit_reservoir) { - bit_offset = get_bits(&s->gb, s->byte_offset_bits + 3); - if (bit_offset > get_bits_left(&s->gb)) { + bit_offset = bitstream_read(&s->bc, s->byte_offset_bits + 3); + if (bit_offset > bitstream_bits_left(&s->bc)) { av_log(avctx, AV_LOG_ERROR, "Invalid last frame bit offset %d > buf size %d (%d)\n", - bit_offset, get_bits_left(&s->gb), buf_size); + bit_offset, bitstream_bits_left(&s->bc), buf_size); goto fail; } @@ -855,27 +844,27 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, if ((s->last_superframe_len + ((bit_offset + 7) >> 3)) > MAX_CODED_SUPERFRAME_SIZE) goto fail; - q = s->last_superframe + s->last_superframe_len; + q = s->last_superframe + s->last_superframe_len; len = bit_offset; while (len > 7) { - *q++ = (get_bits)(&s->gb, 8); + *q++ = bitstream_read(&s->bc, 8); len -= 8; } - if (len > 0) { - *q++ = (get_bits)(&s->gb, len) << (8 - len); - } - memset(q, 0, FF_INPUT_BUFFER_PADDING_SIZE); + if (len > 0) + *q++ = bitstream_read(&s->bc, len) << (8 - len); + memset(q, 0, AV_INPUT_BUFFER_PADDING_SIZE); /* XXX: bit_offset bits into last frame */ - init_get_bits(&s->gb, s->last_superframe, s->last_superframe_len * 8 + bit_offset); + bitstream_init(&s->bc, s->last_superframe, + s->last_superframe_len * 8 + bit_offset); /* skip unused bits */ if (s->last_bitoffset > 0) - skip_bits(&s->gb, s->last_bitoffset); + bitstream_skip(&s->bc, s->last_bitoffset); /* this frame is stored in the last superframe and in the - current one */ - if (wma_decode_frame(s, samples) < 0) + * current one */ + if (wma_decode_frame(s, samples, samples_offset) < 0) goto fail; - samples += s->nb_channels * s->frame_len; + samples_offset += s->frame_len; nb_frames--; } @@ -883,23 +872,24 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, pos = bit_offset + 4 + 4 + s->byte_offset_bits + 3; if (pos >= MAX_CODED_SUPERFRAME_SIZE * 8 || pos > buf_size * 8) return AVERROR_INVALIDDATA; - init_get_bits(&s->gb, buf + (pos >> 3), (buf_size - (pos >> 3))*8); + bitstream_init8(&s->bc, buf + (pos >> 3), buf_size - (pos >> 3)); len = pos & 7; if (len > 0) - skip_bits(&s->gb, len); + bitstream_skip(&s->bc, len); s->reset_block_lengths = 1; - for(i=0;inb_channels * s->frame_len; + samples_offset += s->frame_len; } /* we copy the end of the frame in the last frame buffer */ - pos = get_bits_count(&s->gb) + ((bit_offset + 4 + 4 + s->byte_offset_bits + 3) & ~7); + pos = bitstream_tell(&s->bc) + + ((bit_offset + 4 + 4 + s->byte_offset_bits + 3) & ~7); s->last_bitoffset = pos & 7; - pos >>= 3; - len = buf_size - pos; + 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; @@ -908,18 +898,20 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, memcpy(s->last_superframe, buf + pos, len); } else { /* single frame decode */ - if (wma_decode_frame(s, samples) < 0) + if (wma_decode_frame(s, samples, samples_offset) < 0) goto fail; - samples += s->nb_channels * s->frame_len; + samples_offset += s->frame_len; } -//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d outbytes:%d eaten:%d\n", s->frame_len_bits, s->block_len_bits, s->frame_len, s->block_len, (int8_t *)samples - (int8_t *)data, s->block_align); + ff_dlog(s->avctx, "%d %d %d %d outbytes:%td eaten:%d\n", + s->frame_len_bits, s->block_len_bits, s->frame_len, s->block_len, + (int8_t *) samples - (int8_t *) data, avctx->block_align); + + *got_frame_ptr = 1; - *got_frame_ptr = 1; - *(AVFrame *)data = s->frame; + return avctx->block_align; - return s->block_align; - fail: +fail: /* when error, we reset the bit reservoir */ s->last_superframe_len = 0; return -1; @@ -929,12 +921,13 @@ static av_cold void flush(AVCodecContext *avctx) { WMACodecContext *s = avctx->priv_data; - s->last_bitoffset= - s->last_superframe_len= 0; + s->last_bitoffset = + s->last_superframe_len = 0; } AVCodec ff_wmav1_decoder = { .name = "wmav1", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_WMAV1, .priv_data_size = sizeof(WMACodecContext), @@ -942,12 +935,14 @@ AVCodec ff_wmav1_decoder = { .close = ff_wma_end, .decode = wma_decode_superframe, .flush = flush, - .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), + .capabilities = AV_CODEC_CAP_DR1, + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_NONE }, }; AVCodec ff_wmav2_decoder = { .name = "wmav2", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_WMAV2, .priv_data_size = sizeof(WMACodecContext), @@ -955,6 +950,7 @@ AVCodec ff_wmav2_decoder = { .close = ff_wma_end, .decode = wma_decode_superframe, .flush = flush, - .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), + .capabilities = AV_CODEC_CAP_DR1, + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_NONE }, };