RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-10 14:38:08 +00:00
Code Issues Projects Releases Wiki Activity

dca: Check LFEScaleIndex.

Browse Source 
Its not clear from the spec what to do with values larger than 127
so iam opting for the safe side and ask for a sample.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-02-29 18:09:51 +01:00
parent 33b9fe562a
commit d6bc273bac
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dca.c
View File

@ -817,6 +817,7 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index)
/* Low frequency effect data */ /* Low frequency effect data */
if (!base_channel && s->lfe) { if (!base_channel && s->lfe) {
int quant7;
/* LFE samples */ /* LFE samples */
int lfe_samples = 2 * s->lfe * (4 + block_index); int lfe_samples = 2 * s->lfe * (4 + block_index);
int lfe_end_sample = 2 * s->lfe * (4 + block_index + s->subsubframes[s->current_subframe]); int lfe_end_sample = 2 * s->lfe * (4 + block_index + s->subsubframes[s->current_subframe]);
@ -828,7 +829,12 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index)
} }
/* Scale factor index */ /* Scale factor index */
s->lfe_scale_factor = scale_factor_quant7[get_bits(&s->gb, 8)]; quant7 = get_bits(&s->gb, 8);
if (quant7 > 127) {
av_log_ask_for_sample(s->avctx, "LFEScaleIndex larger than 127\n");
return AVERROR_INVALIDDATA;
}
s->lfe_scale_factor = scale_factor_quant7[quant7];
/* Quantization step size * scale factor */ /* Quantization step size * scale factor */
lfe_scale = 0.035 * s->lfe_scale_factor; lfe_scale = 0.035 * s->lfe_scale_factor;