diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2011-05-13 10:56:45 -0400 |
|---|---|---|
| committer | Yunqing Wang <yunqingwang@google.com> | 2011-05-17 10:59:42 -0400 |
| commit | f62b33f140a150470d784b6ff37ef1c5c227212b (patch) | |
| tree | a84faf49ac402dc4d7a23124f87c9ea793e58eb1 /vp8/encoder/encodeframe.c | |
| parent | 71a7501bcf6ada5068d102c03ae597023e986538 (diff) | |
| download | libvpx-f62b33f140a150470d784b6ff37ef1c5c227212b.tar libvpx-f62b33f140a150470d784b6ff37ef1c5c227212b.tar.gz libvpx-f62b33f140a150470d784b6ff37ef1c5c227212b.tar.bz2 libvpx-f62b33f140a150470d784b6ff37ef1c5c227212b.zip | |
Modify MVcount in pick_inter_mode to eliminate calling of vp8_find_near_mvs
Moved MVcount modification in pick_inter_mode, and eliminated
calling of vp8_find_near_mvs.
Change-Id: Icd47448a1dfc8fdf526f86757d0e5a7f218cb5e8
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index c8805a4f9..c9c52cbd5 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1342,14 +1342,8 @@ int vp8cx_encode_inter_macroblock } else { - int_mv best_ref_mv; - int_mv nearest, nearby; - int mdcounts[4]; int ref_fb_idx; - vp8_find_near_mvs(xd, xd->mode_info_context, - &nearest, &nearby, &best_ref_mv, mdcounts, xd->mode_info_context->mbmi.ref_frame, cpi->common.ref_frame_sign_bias); - vp8_build_uvmvs(xd, cpi->common.full_pixel); if (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME) @@ -1363,25 +1357,6 @@ int vp8cx_encode_inter_macroblock xd->pre.u_buffer = cpi->common.yv12_fb[ref_fb_idx].u_buffer + recon_uvoffset; xd->pre.v_buffer = cpi->common.yv12_fb[ref_fb_idx].v_buffer + recon_uvoffset; - if (xd->mode_info_context->mbmi.mode == SPLITMV) - { - int i; - - for (i = 0; i < 16; i++) - { - if (xd->block[i].bmi.mode == NEW4X4) - { - cpi->MVcount[0][mv_max+((xd->block[i].bmi.mv.as_mv.row - best_ref_mv.as_mv.row) >> 1)]++; - cpi->MVcount[1][mv_max+((xd->block[i].bmi.mv.as_mv.col - best_ref_mv.as_mv.col) >> 1)]++; - } - } - } - else if (xd->mode_info_context->mbmi.mode == NEWMV) - { - cpi->MVcount[0][mv_max+((xd->block[0].bmi.mv.as_mv.row - best_ref_mv.as_mv.row) >> 1)]++; - cpi->MVcount[1][mv_max+((xd->block[0].bmi.mv.as_mv.col - best_ref_mv.as_mv.col) >> 1)]++; - } - if (!x->skip) { vp8_encode_inter16x16(IF_RTCD(&cpi->rtcd), x); |