Mercurial > libavcodec.hg
changeset 2080:6a9472a09ffc libavcodec
coefficient saturation fix
| author | michael |
|---|---|
| date | Mon, 14 Jun 2004 23:41:41 +0000 |
| parents | 75aae96e6b54 |
| children | d3015863f745 |
| files | h263.c |
| diffstat | 1 files changed, 11 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/h263.c Mon Jun 14 16:18:04 2004 +0000 +++ b/h263.c Mon Jun 14 23:41:41 2004 +0000 @@ -4717,8 +4717,6 @@ if (cache&0x80000000) { if (cache&0x40000000) { - int ulevel; - /* third escape */ SKIP_CACHE(re, &s->gb, 2); last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1); @@ -4744,16 +4742,6 @@ SKIP_COUNTER(re, &s->gb, 1+12+1); } - if(s->mpeg_quant){ - if(intra) ulevel= level*s->qscale*s->intra_matrix[scan_table[1]]; - else ulevel= level*s->qscale*s->inter_matrix[scan_table[0]]; - }else - ulevel= level*s->qscale*16; - if(ulevel>1030*16 || ulevel<-1030*16){ - av_log(s->avctx, AV_LOG_ERROR, "|level| overflow in 3. esc, qp=%d\n", s->qscale); - return -1; - } - #if 0 if(s->error_resilience >= FF_ER_COMPLIANT){ const int abs_level= ABS(level); @@ -4779,6 +4767,16 @@ if (level>0) level= level * qmul + qadd; else level= level * qmul - qadd; + if((unsigned)(level + 2048) > 4095){ + if(s->error_resilience > FF_ER_COMPLIANT){ + if(level > 2560 || level<-2560){ + av_log(s->avctx, AV_LOG_ERROR, "|level| overflow in 3. esc, qp=%d\n", s->qscale); + return -1; + } + } + level= level<0 ? -2048 : 2047; + } + i+= run + 1; if(last) i+=192; } else { @@ -6062,7 +6060,7 @@ s->dropable= s->pict_type > P_TYPE; if (s->dropable) s->pict_type = P_TYPE; - + skip_bits1(&s->gb); /* deblocking flag */ s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);