Mercurial > libavcodec.hg
changeset 3282:ecc93139021c libavcodec
use previous qscale for intra_dc_threshold check
| author | michael |
|---|---|
| date | Fri, 28 Apr 2006 17:29:07 +0000 |
| parents | 7fac25904a8b |
| children | c53ef1f63575 |
| files | h263.c mpegvideo.h |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/h263.c Fri Apr 28 17:03:52 2006 +0000 +++ b/h263.c Fri Apr 28 17:29:07 2006 +0000 @@ -3748,6 +3748,8 @@ mb_type= s->current_picture.mb_type[xy]; cbp = s->cbp_table[xy]; + s->use_intra_dc_vlc= s->qscale < s->intra_dc_threshold; + if(s->current_picture.qscale_table[xy] != s->qscale){ ff_set_qscale(s, s->current_picture.qscale_table[xy] ); } @@ -4484,6 +4486,9 @@ return -1; } cbp = (cbpc & 3) | (cbpy << 2); + + s->use_intra_dc_vlc= s->qscale < s->intra_dc_threshold; + if (dquant) { ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); } @@ -4779,7 +4784,7 @@ //Note intra & rvlc should be optimized away if this is inlined if(intra) { - if(s->qscale < s->intra_dc_threshold){ + if(s->use_intra_dc_vlc){ /* DC coef */ if(s->partitioned_frame){ level = s->dc_val[0][ s->block_index[n] ]; @@ -5003,7 +5008,7 @@ } not_coded: if (intra) { - if(s->qscale >= s->intra_dc_threshold){ + if(!s->use_intra_dc_vlc){ block[0] = ff_mpeg4_pred_dc(s, n, block[0], &dc_pred_dir, 0); i -= i>>31; //if(i == -1) i=0;
--- a/mpegvideo.h Fri Apr 28 17:03:52 2006 +0000 +++ b/mpegvideo.h Fri Apr 28 17:29:07 2006 +0000 @@ -602,6 +602,7 @@ int vo_type; int vol_control_parameters; ///< does the stream contain the low_delay flag, used to workaround buggy encoders int intra_dc_threshold; ///< QP above whch the ac VLC should be used for intra dc + int use_intra_dc_vlc; PutBitContext tex_pb; ///< used for data partitioned VOPs PutBitContext pb2; ///< used for data partitioned VOPs int mpeg_quant;