virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Print error messages on errors.

Browse Source 
Originally committed as revision 20757 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2009-12-07 00:35:38 +00:00
parent f78501b264
commit 445a9deea6
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/wmadec.c
View File

@ -355,8 +355,10 @@ static int decode_exp_vlc(WMACodecContext *s, int ch)
while (q < q_end) { while (q < q_end) {
code = get_vlc2(&s->gb, s->exp_vlc.table, EXPVLCBITS, EXPMAX); 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; return -1;
}
/* NOTE: this offset is the same as MPEG4 AAC ! */ /* NOTE: this offset is the same as MPEG4 AAC ! */
last_exp += code - 60; last_exp += code - 60;
if ((unsigned)last_exp + 60 > FF_ARRAY_ELEMS(pow_tab)) { if ((unsigned)last_exp + 60 > FF_ARRAY_ELEMS(pow_tab)) {
@ -457,12 +459,16 @@ static int wma_decode_block(WMACodecContext *s)
if (s->reset_block_lengths) { if (s->reset_block_lengths) {
s->reset_block_lengths = 0; s->reset_block_lengths = 0;
v = get_bits(&s->gb, n); 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; return -1;
}
s->prev_block_len_bits = s->frame_len_bits - v; s->prev_block_len_bits = s->frame_len_bits - v;
v = get_bits(&s->gb, n); 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; return -1;
}
s->block_len_bits = s->frame_len_bits - v; s->block_len_bits = s->frame_len_bits - v;
} else { } else {
/* update block lengths */ /* update block lengths */
@ -470,8 +476,10 @@ static int wma_decode_block(WMACodecContext *s)
s->block_len_bits = s->next_block_len_bits; s->block_len_bits = s->next_block_len_bits;
} }
v = get_bits(&s->gb, n); 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; return -1;
}
s->next_block_len_bits = s->frame_len_bits - v; s->next_block_len_bits = s->frame_len_bits - v;
} else { } else {
/* fixed block len */ /* fixed block len */
@ -482,8 +490,10 @@ static int wma_decode_block(WMACodecContext *s)
/* now check if the block length is coherent with the frame length */ /* now check if the block length is coherent with the frame length */
s->block_len = 1 << s->block_len_bits; 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; return -1;
}
if (s->nb_channels == 2) { if (s->nb_channels == 2) {
s->ms_stereo = get_bits1(&s->gb); s->ms_stereo = get_bits1(&s->gb);
@ -547,8 +557,10 @@ static int wma_decode_block(WMACodecContext *s)
val = get_bits(&s->gb, 7) - 19; val = get_bits(&s->gb, 7) - 19;
} else { } else {
code = get_vlc2(&s->gb, s->hgain_vlc.table, HGAINVLCBITS, HGAINMAX); 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; return -1;
}
val += code - 18; val += code - 18;
} }
s->high_band_values[ch][i] = val; s->high_band_values[ch][i] = val;
@ -882,6 +894,7 @@ static int wma_decode_superframe(AVCodecContext *avctx,
pos >>= 3; pos >>= 3;
len = buf_size - pos; len = buf_size - pos;
if (len > MAX_CODED_SUPERFRAME_SIZE || len < 0) { if (len > MAX_CODED_SUPERFRAME_SIZE || len < 0) {
av_log(s->avctx, AV_LOG_ERROR, "len %d invalid\n", len);
goto fail; goto fail;
} }
s->last_superframe_len = len; s->last_superframe_len = len;