highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/wmadec: handle run_level_decode error

Browse Source 
Consider data as invalid if ff_wma_run_level_decode
gets out with an error.

It avoids an unpleasant sound distorsion.

See http://trac.ffmpeg.org/ticket/9358

(cherry picked from commit f9fbe2f9a9)
This commit is contained in:
Stéphane Cerveau
2021-08-24 09:43:43 -04:00
committed by James Almer
parent 6f24f503ef
commit 79c114e1b2
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/wmadec.c
View File

@ -590,15 +590,18 @@ static int wma_decode_block(WMACodecContext *s)
if (s->channel_coded[ch]) { if (s->channel_coded[ch]) {
int tindex; int tindex;
WMACoef *ptr = &s->coefs1[ch][0]; WMACoef *ptr = &s->coefs1[ch][0];
int ret;
/* special VLC tables are used for ms stereo because /* 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); tindex = (ch == 1 && s->ms_stereo);
memset(ptr, 0, s->block_len * sizeof(WMACoef)); memset(ptr, 0, s->block_len * sizeof(WMACoef));
ff_wma_run_level_decode(s->avctx, &s->gb, &s->coef_vlc[tindex], ret = ff_wma_run_level_decode(s->avctx, &s->gb, &s->coef_vlc[tindex],
s->level_table[tindex], s->run_table[tindex], s->level_table[tindex], s->run_table[tindex],
0, ptr, 0, nb_coefs[ch], 0, ptr, 0, nb_coefs[ch],
s->block_len, s->frame_len_bits, coef_nb_bits); s->block_len, s->frame_len_bits, coef_nb_bits);
if (ret < 0)
return ret;
} }
if (s->version == 1 && s->avctx->channels >= 2) if (s->version == 1 && s->avctx->channels >= 2)
align_get_bits(&s->gb); align_get_bits(&s->gb);