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

avcodec/asvenc: Fix integer overflow in level

Browse Source 
Warn if the qscale is too low for the input data and clip levels to
minimize artifacts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-23 15:46:52 +02:00
parent 6b2caa321f
commit 0bb5ad7a06
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/asvenc.c
View File

@ -50,7 +50,7 @@ static inline void asv1_put_level(PutBitContext *pb, int level)
} }
} }
static inline void asv2_put_level(PutBitContext *pb, int level) static inline void asv2_put_level(ASV1Context *a, PutBitContext *pb, int level)
{ {
unsigned int index = level + 31; unsigned int index = level + 31;
@ -58,6 +58,10 @@ static inline void asv2_put_level(PutBitContext *pb, int level)
put_bits(pb, ff_asv2_level_tab[index][1], ff_asv2_level_tab[index][0]); put_bits(pb, ff_asv2_level_tab[index][1], ff_asv2_level_tab[index][0]);
} else { } else {
put_bits(pb, ff_asv2_level_tab[31][1], ff_asv2_level_tab[31][0]); put_bits(pb, ff_asv2_level_tab[31][1], ff_asv2_level_tab[31][0]);
if (level < -128 || level > 127) {
av_log(a->avctx, AV_LOG_WARNING, "Cliping level %d, increase qscale\n", level);
level = av_clip_int8(level);
}
asv2_put_bits(pb, 8, level & 0xFF); asv2_put_bits(pb, 8, level & 0xFF);
} }
} }
@ -150,13 +154,13 @@ static inline void asv2_encode_block(ASV1Context *a, int16_t block[64])
if (ccp) { if (ccp) {
if (ccp & 8) if (ccp & 8)
asv2_put_level(&a->pb, block[index + 0]); asv2_put_level(a, &a->pb, block[index + 0]);
if (ccp & 4) if (ccp & 4)
asv2_put_level(&a->pb, block[index + 8]); asv2_put_level(a, &a->pb, block[index + 8]);
if (ccp & 2) if (ccp & 2)
asv2_put_level(&a->pb, block[index + 1]); asv2_put_level(a, &a->pb, block[index + 1]);
if (ccp & 1) if (ccp & 1)
asv2_put_level(&a->pb, block[index + 9]); asv2_put_level(a, &a->pb, block[index + 9]);
} }
} }
} }