From f7813a5324be39d13ab536c245d15dfc602a7849 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Sun, 29 Dec 2013 12:19:38 +0000 Subject: basic type mechanism working --- ffmpeg/libavcodec/wmv2enc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'ffmpeg/libavcodec/wmv2enc.c') diff --git a/ffmpeg/libavcodec/wmv2enc.c b/ffmpeg/libavcodec/wmv2enc.c index 23b64a7..6aeee59 100644 --- a/ffmpeg/libavcodec/wmv2enc.c +++ b/ffmpeg/libavcodec/wmv2enc.c @@ -169,10 +169,12 @@ void ff_wmv2_encode_mb(MpegEncContext * s, ff_wmv2_inter_table[w->cbp_table_index][cbp + 64][1], ff_wmv2_inter_table[w->cbp_table_index][cbp + 64][0]); + s->misc_bits += get_bits_diff(s); /* motion vector */ ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y); ff_msmpeg4_encode_motion(s, motion_x - pred_x, motion_y - pred_y); + s->mv_bits += get_bits_diff(s); } else { /* compute cbp */ cbp = 0; @@ -203,15 +205,21 @@ void ff_wmv2_encode_mb(MpegEncContext * s, s->h263_aic_dir=0; put_bits(&s->pb, ff_table_inter_intra[s->h263_aic_dir][1], ff_table_inter_intra[s->h263_aic_dir][0]); } + s->misc_bits += get_bits_diff(s); } for (i = 0; i < 6; i++) { ff_msmpeg4_encode_block(s, block[i], i); } + if (s->mb_intra) + s->i_tex_bits += get_bits_diff(s); + else + s->p_tex_bits += get_bits_diff(s); } AVCodec ff_wmv2_encoder = { .name = "wmv2", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WMV2, .priv_data_size = sizeof(Wmv2Context), @@ -219,5 +227,4 @@ AVCodec ff_wmv2_encoder = { .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), }; -- cgit v1.2.3