generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/wmadec: fix 0 frame bit_reservoir

Browse Source 
Fixes Ticket968
partly fixes Ticket691

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-12 01:51:06 +01:00
parent a8bc901033
commit e2db9a736f
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/wma.h
View File

@ -42,7 +42,7 @@
#define NB_LSP_COEFS 10
/* XXX: is it a suitable value ? */
#define MAX_CODED_SUPERFRAME_SIZE 16384
#define MAX_CODED_SUPERFRAME_SIZE 32768
#define MAX_CHANNELS 2

24
libavcodec/wmadec.c
View File

@ -840,9 +840,29 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data,
skip_bits(&s->gb, 4); /* super frame index */
nb_frames = get_bits(&s->gb, 4) - (s->last_superframe_len <= 0);
if (nb_frames <= 0) {
av_log(avctx, AV_LOG_ERROR, "nb_frames is %d bits left %d\n",
int is_error = nb_frames < 0 || get_bits_left(&s->gb) <= 8;
av_log(avctx, is_error ? AV_LOG_ERROR : AV_LOG_WARNING,
"nb_frames is %d bits left %d\n",
nb_frames, get_bits_left(&s->gb));
return AVERROR_INVALIDDATA;
if (is_error)
return AVERROR_INVALIDDATA;
if ((s->last_superframe_len + buf_size - 1) >
MAX_CODED_SUPERFRAME_SIZE)
goto fail;
q = s->last_superframe + s->last_superframe_len;
len = buf_size - 1;
while (len > 0) {
*q++ = get_bits (&s->gb, 8);
len --;
}
memset(q, 0, FF_INPUT_BUFFER_PADDING_SIZE);
s->last_superframe_len += 8*buf_size - 8;
// s->reset_block_lengths = 1; //XXX is this needed ?
*got_frame_ptr = 0;
return buf_size;
}
} else
nb_frames = 1;