diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 7 | ||||
| -rw-r--r-- | libavcodec/msmpeg4.c | 8 | ||||
| -rw-r--r-- | libavcodec/wmv2.c | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 867f4232a3..99ac289f91 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -648,6 +648,7 @@ int MPV_encode_init(AVCodecContext *avctx) s->h263_pred = 1; s->unrestricted_mv = 1; s->msmpeg4_version= 3; + s->flipflop_rounding=1; avctx->delay=0; s->low_delay=1; break; @@ -657,6 +658,7 @@ int MPV_encode_init(AVCodecContext *avctx) s->h263_pred = 1; s->unrestricted_mv = 1; s->msmpeg4_version= 4; + s->flipflop_rounding=1; avctx->delay=0; s->low_delay=1; break; @@ -666,6 +668,7 @@ int MPV_encode_init(AVCodecContext *avctx) s->h263_pred = 1; s->unrestricted_mv = 1; s->msmpeg4_version= 5; + s->flipflop_rounding=1; avctx->delay=0; s->low_delay=1; break; @@ -2834,8 +2837,8 @@ static void encode_picture(MpegEncContext *s, int picture_number) s->qscale= (int)(s->frame_qscale + 0.5); //FIXME qscale / ... stuff for ME ratedistoration if(s->pict_type==I_TYPE){ - if(s->msmpeg4_version) s->no_rounding=1; - else s->no_rounding=0; + if(s->msmpeg4_version >= 3) s->no_rounding=1; + else s->no_rounding=0; }else if(s->pict_type!=B_TYPE){ if(s->flipflop_rounding || s->codec_id == CODEC_ID_H263P || s->codec_id == CODEC_ID_MPEG4) s->no_rounding ^= 1; diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 4bac6d3b74..115e71375f 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -439,12 +439,10 @@ void msmpeg4_encode_ext_header(MpegEncContext * s) put_bits(&s->pb, 11, FFMIN(s->bit_rate/1024, 2047)); - if(s->msmpeg4_version<3) - s->flipflop_rounding=0; - else{ - s->flipflop_rounding=1; + if(s->msmpeg4_version>=3) put_bits(&s->pb, 1, s->flipflop_rounding); - } + else + assert(s->flipflop_rounding==0); } #endif //CONFIG_ENCODERS diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 99780f6f41..2c15694212 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -131,7 +131,10 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number) w->abt_type=0; w->j_type=0; + assert(s->flipflop_rounding); + if (s->pict_type == I_TYPE) { + assert(s->no_rounding==1); if(w->j_type_bit) put_bits(&s->pb, 1, w->j_type); if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table); @@ -144,7 +147,6 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number) put_bits(&s->pb, 1, s->dc_table_index); s->inter_intra_pred= 0; - s->no_rounding = 1; }else{ int cbp_index; @@ -181,7 +183,6 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number) put_bits(&s->pb, 1, s->mv_table_index); s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE); - s->no_rounding ^= 1; } s->esc3_level_length= 0; s->esc3_run_length= 0; |