*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+/**
+ * @file wmadec.c
+ * 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
+ * (ASF/AVI/WAV). WMA v2 is identified by audio format 0x161.
+ *
+ * To use this decoder, a calling application must supply the extra data
+ * bytes provided with the WMA data. These are the extra, codec-specific
+ * bytes at the end of a WAVEFORMATEX data structure. Transmit these bytes
+ * to the decoder using the extradata[_size] fields in AVCodecContext. There
+ * should be 4 extra bytes for v1 data and 6 extra bytes for v2 data.
+ */
+
#include "avcodec.h"
+#include "bitstream.h"
#include "dsputil.h"
-//#define DEBUG_PARAMS
-//#define DEBUG_TRACE
-
/* size of blocks */
#define BLOCK_MIN_BITS 7
#define BLOCK_MAX_BITS 11
#define NB_LSP_COEFS 10
/* XXX: is it a suitable value ? */
-#define MAX_CODED_SUPERFRAME_SIZE 4096
+#define MAX_CODED_SUPERFRAME_SIZE 16384
#define MAX_CHANNELS 2
#define LSP_POW_BITS 7
+#define VLCBITS 9
+
typedef struct WMADecodeContext {
GetBitContext gb;
int sample_rate;
int coefs_start; /* first coded coef */
int coefs_end[BLOCK_NB_SIZES]; /* max number of coded coefficients */
int exponent_high_sizes[BLOCK_NB_SIZES];
- int exponent_high_bands[BLOCK_NB_SIZES][HIGH_BAND_MAX_SIZE];
+ int exponent_high_bands[BLOCK_NB_SIZES][HIGH_BAND_MAX_SIZE];
VLC hgain_vlc;
-
+
/* coded values in high bands */
int high_band_coded[MAX_CHANNELS][HIGH_BAND_MAX_SIZE];
int high_band_values[MAX_CHANNELS][HIGH_BAND_MAX_SIZE];
int block_pos; /* current position in frame */
uint8_t ms_stereo; /* true if mid/side stereo mode */
uint8_t channel_coded[MAX_CHANNELS]; /* true if channel is coded */
- float exponents[MAX_CHANNELS][BLOCK_MAX_SIZE];
+ DECLARE_ALIGNED_16(float, exponents[MAX_CHANNELS][BLOCK_MAX_SIZE]);
float max_exponent[MAX_CHANNELS];
int16_t coefs1[MAX_CHANNELS][BLOCK_MAX_SIZE];
- float coefs[MAX_CHANNELS][BLOCK_MAX_SIZE];
+ DECLARE_ALIGNED_16(float, coefs[MAX_CHANNELS][BLOCK_MAX_SIZE]);
MDCTContext mdct_ctx[BLOCK_NB_SIZES];
float *windows[BLOCK_NB_SIZES];
- FFTSample mdct_tmp[BLOCK_MAX_SIZE]; /* temporary storage for imdct */
+ DECLARE_ALIGNED_16(FFTSample, mdct_tmp[BLOCK_MAX_SIZE]); /* temporary storage for imdct */
/* output buffer for one frame and the last for IMDCT windowing */
- float frame_out[MAX_CHANNELS][BLOCK_MAX_SIZE * 2];
+ DECLARE_ALIGNED_16(float, frame_out[MAX_CHANNELS][BLOCK_MAX_SIZE * 2]);
/* last frame info */
uint8_t last_superframe[MAX_CODED_SUPERFRAME_SIZE + 4]; /* padding added */
int last_bitoffset;
float lsp_pow_e_table[256];
float lsp_pow_m_table1[(1 << LSP_POW_BITS)];
float lsp_pow_m_table2[(1 << LSP_POW_BITS)];
+
+#ifdef TRACE
+ int frame_count;
+#endif
} WMADecodeContext;
typedef struct CoefVLCTable {
#include "wmadata.h"
-#ifdef DEBUG_TRACE
-
-int frame_count;
-
-static FILE *flog;
-
-void trace(const char *fmt, ...)
-{
- va_list ap;
-
-
- if (!flog) {
- flog = fopen("/tmp/out.log", "w");
- setlinebuf(flog);
- }
-
- va_start(ap, fmt);
- vfprintf(flog, fmt, ap);
- va_end(ap);
-}
-
-#define get_bits(s, n) get_bits_trace(s, n)
-#define get_vlc(s, vlc) get_vlc_trace(s, vlc)
-
-unsigned int get_bits_trace(GetBitContext *s, int n)
-{
- unsigned int val;
- val = (get_bits)(s, n);
- trace("get_bits(%d) : 0x%x\n", n, val);
- return val;
-}
-
-static int get_vlc_trace(GetBitContext *s, VLC *vlc)
-{
- int code;
- code = (get_vlc)(s, vlc);
- trace("get_vlc() : %d\n", code);
- return code;
-}
-
+#ifdef TRACE
static void dump_shorts(const char *name, const short *tab, int n)
{
int i;
- trace("%s[%d]:\n", name, n);
+ tprintf("%s[%d]:\n", name, n);
for(i=0;i<n;i++) {
if ((i & 7) == 0)
- trace("%4d: ", i);
- trace(" %5d.0", tab[i]);
+ tprintf("%4d: ", i);
+ tprintf(" %5d.0", tab[i]);
if ((i & 7) == 7)
- trace("\n");
+ tprintf("\n");
}
}
{
int i;
- trace("%s[%d]:\n", name, n);
+ tprintf("%s[%d]:\n", name, n);
for(i=0;i<n;i++) {
if ((i & 7) == 0)
- trace("%4d: ", i);
- trace(" %8.*f", prec, tab[i]);
+ tprintf("%4d: ", i);
+ tprintf(" %8.*f", prec, tab[i]);
if ((i & 7) == 7)
- trace("\n");
+ tprintf("\n");
}
if ((i & 7) != 0)
- trace("\n");
+ tprintf("\n");
}
-
-#else
-
-#define trace(fmt, ...)
-
#endif
/* XXX: use same run/length optimization as mpeg decoders */
-static void init_coef_vlc(VLC *vlc,
+static void init_coef_vlc(VLC *vlc,
uint16_t **prun_table, uint16_t **plevel_table,
const CoefVLCTable *vlc_table)
{
const uint16_t *p;
int i, l, j, level;
- init_vlc(vlc, 9, n, table_bits, 1, 1, table_codes, 4, 4);
+ init_vlc(vlc, 9, n, table_bits, 1, 1, table_codes, 4, 4, 0);
- run_table = malloc(n * sizeof(uint16_t));
- level_table = malloc(n * sizeof(uint16_t));
+ run_table = av_malloc(n * sizeof(uint16_t));
+ level_table = av_malloc(n * sizeof(uint16_t));
p = levels_table;
i = 2;
level = 1;
int i, flags1, flags2;
float *window;
uint8_t *extradata;
- float bps1, high_freq, bps;
+ float bps1, high_freq;
+ volatile float bps;
int sample_rate1;
int coef_vlc_table;
-
+
s->sample_rate = avctx->sample_rate;
s->nb_channels = avctx->channels;
s->bit_rate = avctx->bit_rate;
s->block_align = avctx->block_align;
- if (avctx->codec_id == CODEC_ID_WMAV1) {
+ if (avctx->codec->id == CODEC_ID_WMAV1) {
s->version = 1;
} else {
s->version = 2;
}
-
+
/* extract flag infos */
flags1 = 0;
flags2 = 0;
flags1 = extradata[0] | (extradata[1] << 8);
flags2 = extradata[2] | (extradata[3] << 8);
} else if (s->version == 2 && avctx->extradata_size >= 6) {
- flags1 = extradata[0] | (extradata[1] << 8) |
+ flags1 = extradata[0] | (extradata[1] << 8) |
(extradata[2] << 16) | (extradata[3] << 24);
flags2 = extradata[4] | (extradata[5] << 8);
}
/* compute MDCT block size */
if (s->sample_rate <= 16000) {
s->frame_len_bits = 9;
- } else if (s->sample_rate <= 32000 && s->version == 1) {
+ } else if (s->sample_rate <= 22050 ||
+ (s->sample_rate <= 32000 && s->version == 1)) {
s->frame_len_bits = 10;
} else {
s->frame_len_bits = 11;
}
s->frame_len = 1 << s->frame_len_bits;
if (s->use_variable_block_len) {
- s->nb_block_sizes = s->frame_len_bits - BLOCK_MIN_BITS + 1;
+ int nb_max, nb;
+ nb = ((flags2 >> 3) & 3) + 1;
+ if ((s->bit_rate / s->nb_channels) >= 32000)
+ nb += 2;
+ nb_max = s->frame_len_bits - BLOCK_MIN_BITS;
+ if (nb > nb_max)
+ nb = nb_max;
+ s->nb_block_sizes = nb + 1;
} else {
s->nb_block_sizes = 1;
}
/* if version 2, then the rates are normalized */
sample_rate1 = s->sample_rate;
if (s->version == 2) {
- if (sample_rate1 >= 44100)
+ if (sample_rate1 >= 44100)
sample_rate1 = 44100;
- else if (sample_rate1 >= 22050)
+ else if (sample_rate1 >= 22050)
sample_rate1 = 22050;
- else if (sample_rate1 >= 16000)
+ else if (sample_rate1 >= 16000)
sample_rate1 = 16000;
- else if (sample_rate1 >= 11025)
+ else if (sample_rate1 >= 11025)
sample_rate1 = 11025;
- else if (sample_rate1 >= 8000)
+ else if (sample_rate1 >= 8000)
sample_rate1 = 8000;
}
bps = (float)s->bit_rate / (float)(s->nb_channels * s->sample_rate);
- s->byte_offset_bits = av_log2((int)(bps * s->frame_len / 8.0)) + 2;
+ s->byte_offset_bits = av_log2((int)(bps * s->frame_len / 8.0 + 0.5)) + 2;
/* compute high frequency value and choose if noise coding should
be activated */
} else if (sample_rate1 == 22050) {
if (bps1 >= 1.16)
s->use_noise_coding = 0;
- else if (bps1 >= 0.72)
+ else if (bps1 >= 0.72)
high_freq = high_freq * 0.7;
else
high_freq = high_freq * 0.6;
high_freq = high_freq * 0.5;
}
}
-#ifdef DEBUG_PARAMS
- printf("flags1=0x%x flags2=0x%x\n", flags1, flags2);
- printf("version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n",
- s->version, s->nb_channels, s->sample_rate, s->bit_rate,
+ dprintf("flags1=0x%x flags2=0x%x\n", flags1, flags2);
+ dprintf("version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n",
+ s->version, s->nb_channels, s->sample_rate, s->bit_rate,
s->block_align);
- printf("bps=%f bps1=%f high_freq=%f bitoffset=%d\n",
+ dprintf("bps=%f bps1=%f high_freq=%f bitoffset=%d\n",
bps, bps1, high_freq, s->byte_offset_bits);
- printf("use_noise_coding=%d use_exp_vlc=%d\n",
- s->use_noise_coding, s->use_exp_vlc);
-#endif
+ dprintf("use_noise_coding=%d use_exp_vlc=%d nb_block_sizes=%d\n",
+ s->use_noise_coding, s->use_exp_vlc, s->nb_block_sizes);
/* compute the scale factor band sizes for each MDCT block size */
{
int a, b, pos, lpos, k, block_len, i, j, n;
const uint8_t *table;
-
+
if (s->version == 1) {
s->coefs_start = 3;
} else {
a = wma_critical_freqs[i];
b = s->sample_rate;
pos = ((block_len * 2 * a) + (b >> 1)) / b;
- if (pos > block_len)
+ if (pos > block_len)
pos = block_len;
s->exponent_bands[0][i] = pos - lpos;
if (pos >= block_len) {
b = s->sample_rate;
pos = ((block_len * 2 * a) + (b << 1)) / (4 * b);
pos <<= 2;
- if (pos > block_len)
+ if (pos > block_len)
pos = block_len;
if (pos > lpos)
s->exponent_bands[k][j++] = pos - lpos;
/* max number of coefs */
s->coefs_end[k] = (s->frame_len - ((s->frame_len * 9) / 100)) >> k;
/* high freq computation */
- s->high_band_start[k] = (int)((block_len * 2 * high_freq) /
+ s->high_band_start[k] = (int)((block_len * 2 * high_freq) /
s->sample_rate + 0.5);
n = s->exponent_sizes[k];
j = 0;
}
s->exponent_high_sizes[k] = j;
#if 0
- trace("%5d: coefs_end=%d high_band_start=%d nb_high_bands=%d: ",
- s->frame_len >> k,
+ tprintf("%5d: coefs_end=%d high_band_start=%d nb_high_bands=%d: ",
+ s->frame_len >> k,
s->coefs_end[k],
s->high_band_start[k],
s->exponent_high_sizes[k]);
for(j=0;j<s->exponent_high_sizes[k];j++)
- trace(" %d", s->exponent_high_bands[k][j]);
- trace("\n");
+ tprintf(" %d", s->exponent_high_bands[k][j]);
+ tprintf("\n");
#endif
}
}
-#ifdef DEBUG_TRACE
+#ifdef TRACE
{
int i, j;
for(i = 0; i < s->nb_block_sizes; i++) {
- trace("%5d: n=%2d:",
- s->frame_len >> i,
+ tprintf("%5d: n=%2d:",
+ s->frame_len >> i,
s->exponent_sizes[i]);
for(j=0;j<s->exponent_sizes[i];j++)
- trace(" %d", s->exponent_bands[i][j]);
- trace("\n");
+ tprintf(" %d", s->exponent_bands[i][j]);
+ tprintf("\n");
}
}
#endif
/* init MDCT */
for(i = 0; i < s->nb_block_sizes; i++)
- mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 1);
-
+ ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 1);
+
/* init MDCT windows : simple sinus window */
for(i = 0; i < s->nb_block_sizes; i++) {
int n, j;
}
s->reset_block_lengths = 1;
-
+
if (s->use_noise_coding) {
/* init the noise generator */
s->noise_mult = 0.02;
else
s->noise_mult = 0.04;
-
-#if defined(DEBUG_TRACE)
+
+#ifdef TRACE
for(i=0;i<NOISE_TAB_SIZE;i++)
s->noise_table[i] = 1.0 * s->noise_mult;
#else
}
}
#endif
- init_vlc(&s->hgain_vlc, 9, sizeof(hgain_huffbits),
+ init_vlc(&s->hgain_vlc, 9, sizeof(hgain_huffbits),
hgain_huffbits, 1, 1,
- hgain_huffcodes, 2, 2);
+ hgain_huffcodes, 2, 2, 0);
}
if (s->use_exp_vlc) {
- init_vlc(&s->exp_vlc, 9, sizeof(scale_huffbits),
+ init_vlc(&s->exp_vlc, 9, sizeof(scale_huffbits),
scale_huffbits, 1, 1,
- scale_huffcodes, 4, 4);
+ scale_huffcodes, 4, 4, 0);
} else {
wma_lsp_to_curve_init(s, s->frame_len);
}
}
static void wma_lsp_to_curve_init(WMADecodeContext *s, int frame_len)
-{
+{
float wdel, a, b;
int i, e, m;
/* NOTE: We use the same code as Vorbis here */
/* XXX: optimize it further with SSE/3Dnow */
-static void wma_lsp_to_curve(WMADecodeContext *s,
- float *out, float *val_max_ptr,
+static void wma_lsp_to_curve(WMADecodeContext *s,
+ float *out, float *val_max_ptr,
int n, float *lsp)
{
int i, j;
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];
}
last_exp = 36;
while (q < q_end) {
- code = get_vlc(&s->gb, &s->exp_vlc);
+ code = get_vlc2(&s->gb, s->exp_vlc.table, VLCBITS, 2);
if (code < 0)
return -1;
/* NOTE: this offset is the same as MPEG4 AAC ! */
int n, v, a, ch, code, bsize;
int coef_nb_bits, total_gain, parse_exponents;
float window[BLOCK_MAX_SIZE * 2];
+// XXX: FIXME!! there's a bug somewhere which makes this mandatory under altivec
+#ifdef HAVE_ALTIVEC
+ volatile int nb_coefs[MAX_CHANNELS] __attribute__((aligned(16)));
+#else
int nb_coefs[MAX_CHANNELS];
+#endif
float mdct_norm;
- trace("***decode_block: %d:%d\n", frame_count - 1, s->block_num);
+#ifdef TRACE
+ tprintf("***decode_block: %d:%d\n", s->frame_count - 1, s->block_num);
+#endif
/* compute current block length */
if (s->use_variable_block_len) {
n = av_log2(s->nb_block_sizes - 1) + 1;
-
+
if (s->reset_block_lengths) {
s->reset_block_lengths = 0;
v = get_bits(&s->gb, n);
if (a != 127)
break;
}
-
+
if (total_gain < 15)
coef_nb_bits = 13;
else if (total_gain < 32)
if (val == (int)0x80000000) {
val = get_bits(&s->gb, 7) - 19;
} else {
- code = get_vlc(&s->gb, &s->hgain_vlc);
+ code = get_vlc2(&s->gb, s->hgain_vlc.table, VLCBITS, 2);
if (code < 0)
return -1;
val += code - 18;
}
}
}
-
+
/* exposant can be interpolated in short blocks. */
parse_exponents = 1;
if (s->block_len_bits != s->frame_len_bits) {
parse_exponents = get_bits(&s->gb, 1);
}
-
+
if (parse_exponents) {
for(ch = 0; ch < s->nb_channels; ch++) {
if (s->channel_coded[ch]) {
} else {
for(ch = 0; ch < s->nb_channels; ch++) {
if (s->channel_coded[ch]) {
- interpolate_array(s->exponents[ch], 1 << s->prev_block_len_bits,
+ interpolate_array(s->exponents[ch], 1 << s->prev_block_len_bits,
s->block_len);
}
}
eptr = ptr + nb_coefs[ch];
memset(ptr, 0, s->block_len * sizeof(int16_t));
for(;;) {
- code = get_vlc(&s->gb, coef_vlc);
+ code = get_vlc2(&s->gb, coef_vlc->table, VLCBITS, 3);
if (code < 0)
return -1;
if (code == 1) {
align_get_bits(&s->gb);
}
}
-
+
/* normalize */
{
int n4 = s->block_len / 2;
*coefs++ = s->noise_table[s->noise_index] * (*exponents++) * mult1;
s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1);
}
-
+
n1 = s->exponent_high_sizes[bsize];
/* compute power of high bands */
- exp_ptr = exponents +
- s->high_band_start[bsize] -
+ exp_ptr = exponents +
+ s->high_band_start[bsize] -
s->coefs_start;
last_high_band = 0; /* avoid warning */
for(j=0;j<n1;j++) {
- n = s->exponent_high_bands[s->frame_len_bits -
+ n = s->exponent_high_bands[s->frame_len_bits -
s->block_len_bits][j];
if (s->high_band_coded[ch][j]) {
float e2, v;
}
exp_power[j] = e2 / n;
last_high_band = j;
- trace("%d: power=%f (%d)\n", j, exp_power[j], n);
+ tprintf("%d: power=%f (%d)\n", j, exp_power[j], n);
}
exp_ptr += n;
}
/* main freqs and high freqs */
for(j=-1;j<n1;j++) {
if (j < 0) {
- n = s->high_band_start[bsize] -
+ n = s->high_band_start[bsize] -
s->coefs_start;
} else {
- n = s->exponent_high_bands[s->frame_len_bits -
+ n = s->exponent_high_bands[s->frame_len_bits -
s->block_len_bits][j];
}
if (j >= 0 && s->high_band_coded[ch][j]) {
}
}
-#ifdef DEBUG_TRACE
+#ifdef TRACE
for(ch = 0; ch < s->nb_channels; ch++) {
if (s->channel_coded[ch]) {
dump_floats("exponents", 3, s->exponents[ch], s->block_len);
}
}
#endif
-
+
if (s->ms_stereo && s->channel_coded[1]) {
float a, b;
int i;
/* no need to optimize this case because it should almost
never happen */
if (!s->channel_coded[0]) {
-#ifdef DEBUG_TRACE
- trace("rare ms-stereo case happened\n");
-#endif
+ tprintf("rare ms-stereo case happened\n");
memset(s->coefs[0], 0, sizeof(float) * s->block_len);
s->channel_coded[0] = 1;
}
-
+
for(i = 0; i < s->block_len; i++) {
a = s->coefs[0][i];
b = s->coefs[1][i];
}
}
-
+
for(ch = 0; ch < s->nb_channels; ch++) {
if (s->channel_coded[ch]) {
- FFTSample output[BLOCK_MAX_SIZE * 2];
+ DECLARE_ALIGNED_16(FFTSample, output[BLOCK_MAX_SIZE * 2]);
float *ptr;
int i, n4, index, n;
n = s->block_len;
n4 = s->block_len / 2;
- imdct_calc(&s->mdct_ctx[bsize],
- output, s->coefs[ch], s->mdct_tmp);
+ ff_imdct_calc(&s->mdct_ctx[bsize],
+ output, s->coefs[ch], s->mdct_tmp);
/* XXX: optimize all that by build the window and
multipying/adding at the same time */
int16_t *ptr;
float *iptr;
- trace("***decode_frame: %d size=%d\n", frame_count++, s->frame_len);
+#ifdef TRACE
+ tprintf("***decode_frame: %d size=%d\n", s->frame_count++, s->frame_len);
+#endif
/* read each block */
s->block_num = 0;
s->block_pos = 0;
for(;;) {
ret = wma_decode_block(s);
- if (ret < 0)
+ if (ret < 0)
return -1;
if (ret)
break;
iptr = s->frame_out[ch];
for(i=0;i<n;i++) {
- a = lrint(*iptr++);
+ a = lrintf(*iptr++);
if (a > 32767)
a = 32767;
else if (a < -32768)
memmove(&s->frame_out[ch][0], &s->frame_out[ch][s->frame_len],
s->frame_len * sizeof(float));
/* XXX: suppress this */
- memset(&s->frame_out[ch][s->frame_len], 0,
+ memset(&s->frame_out[ch][s->frame_len], 0,
s->frame_len * sizeof(float));
}
-#ifdef DEBUG_TRACE
+#ifdef TRACE
dump_shorts("samples", samples, n * s->nb_channels);
#endif
return 0;
}
-static int wma_decode_superframe(AVCodecContext *avctx,
+static int wma_decode_superframe(AVCodecContext *avctx,
void *data, int *data_size,
- UINT8 *buf, int buf_size)
+ uint8_t *buf, int buf_size)
{
WMADecodeContext *s = avctx->priv_data;
int nb_frames, bit_offset, i, pos, len;
uint8_t *q;
int16_t *samples;
-
- trace("***decode_superframe:\n");
+
+ tprintf("***decode_superframe:\n");
+
+ if(buf_size==0){
+ s->last_superframe_len = 0;
+ return 0;
+ }
samples = data;
- init_get_bits(&s->gb, buf, buf_size);
-
+ init_get_bits(&s->gb, buf, buf_size*8);
+
if (s->use_bit_reservoir) {
/* read super frame header */
get_bits(&s->gb, 4); /* super frame index */
if (s->last_superframe_len > 0) {
// printf("skip=%d\n", s->last_bitoffset);
/* add bit_offset bits to last frame */
- if ((s->last_superframe_len + ((bit_offset + 7) >> 3)) >
+ if ((s->last_superframe_len + ((bit_offset + 7) >> 3)) >
MAX_CODED_SUPERFRAME_SIZE)
- return -1;
+ goto fail;
q = s->last_superframe + s->last_superframe_len;
len = bit_offset;
while (len > 0) {
if (len > 0) {
*q++ = (get_bits)(&s->gb, len) << (8 - len);
}
-
+
/* XXX: bit_offset bits into last frame */
- init_get_bits(&s->gb, s->last_superframe, MAX_CODED_SUPERFRAME_SIZE);
+ init_get_bits(&s->gb, s->last_superframe, MAX_CODED_SUPERFRAME_SIZE*8);
/* skip unused bits */
if (s->last_bitoffset > 0)
skip_bits(&s->gb, s->last_bitoffset);
/* this frame is stored in the last superframe and in the
current one */
if (wma_decode_frame(s, samples) < 0)
- return -1;
+ goto fail;
samples += s->nb_channels * s->frame_len;
}
/* read each frame starting from bit_offset */
pos = bit_offset + 4 + 4 + s->byte_offset_bits + 3;
- init_get_bits(&s->gb, buf + (pos >> 3), MAX_CODED_SUPERFRAME_SIZE - (pos >> 3));
+ init_get_bits(&s->gb, buf + (pos >> 3), (MAX_CODED_SUPERFRAME_SIZE - (pos >> 3))*8);
len = pos & 7;
if (len > 0)
skip_bits(&s->gb, len);
-
+
s->reset_block_lengths = 1;
for(i=0;i<nb_frames;i++) {
if (wma_decode_frame(s, samples) < 0)
- return -1;
+ goto fail;
samples += s->nb_channels * s->frame_len;
}
s->last_bitoffset = pos & 7;
pos >>= 3;
len = buf_size - pos;
- if (len > MAX_CODED_SUPERFRAME_SIZE) {
- return -1;
+ if (len > MAX_CODED_SUPERFRAME_SIZE || len < 0) {
+ goto fail;
}
s->last_superframe_len = len;
memcpy(s->last_superframe, buf + pos, len);
} else {
/* single frame decode */
if (wma_decode_frame(s, samples) < 0)
- return -1;
+ goto fail;
samples += s->nb_channels * s->frame_len;
}
*data_size = (int8_t *)samples - (int8_t *)data;
return s->block_align;
+ fail:
+ /* when error, we reset the bit reservoir */
+ s->last_superframe_len = 0;
+ return -1;
}
static int wma_decode_end(AVCodecContext *avctx)
int i;
for(i = 0; i < s->nb_block_sizes; i++)
- mdct_end(&s->mdct_ctx[i]);
+ ff_mdct_end(&s->mdct_ctx[i]);
for(i = 0; i < s->nb_block_sizes; i++)
av_free(s->windows[i]);
av_free(s->run_table[i]);
av_free(s->level_table[i]);
}
-
+
return 0;
}
projects / ffmpeg / blobdiff