diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-02-28 12:11:46 -0800 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2014-02-28 12:11:46 -0800 |
| commit | ce404e898ce95fc0c2ebce844d2015c148cb1987 (patch) | |
| tree | 140c98cb746f9cb85ae8a51f3796836c97600933 /vp9 | |
| parent | d6321c3e68dd675da246d8b191db142d44196d51 (diff) | |
| download | libvpx-ce404e898ce95fc0c2ebce844d2015c148cb1987.tar libvpx-ce404e898ce95fc0c2ebce844d2015c148cb1987.tar.gz libvpx-ce404e898ce95fc0c2ebce844d2015c148cb1987.tar.bz2 libvpx-ce404e898ce95fc0c2ebce844d2015c148cb1987.zip | |
Replacing int_mv with MV.
Change-Id: Ib68d4a2de838254a66272324b909292048cbe60d
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 87f20fa1c..05ba651c7 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -140,12 +140,12 @@ static int full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x, static void sub_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x, const TileInfo *const tile, BLOCK_SIZE bsize, int mi_row, int mi_col, - int_mv *tmp_mv) { + MV *tmp_mv) { MACROBLOCKD *xd = &x->e_mbd; MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi; struct buf_2d backup_yv12[MAX_MB_PLANE] = {{0}}; int ref = mbmi->ref_frame[0]; - int_mv ref_mv = mbmi->ref_mvs[ref][0]; + MV ref_mv = mbmi->ref_mvs[ref][0].as_mv; int dis; const YV12_BUFFER_CONFIG *scaled_ref_frame = vp9_get_scaled_ref_frame(cpi, @@ -161,10 +161,10 @@ static void sub_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x, setup_pre_planes(xd, 0, scaled_ref_frame, mi_row, mi_col, NULL); } - tmp_mv->as_mv.col >>= 3; - tmp_mv->as_mv.row >>= 3; + tmp_mv->col >>= 3; + tmp_mv->row >>= 3; - cpi->find_fractional_mv_step(x, &tmp_mv->as_mv, &ref_mv.as_mv, + cpi->find_fractional_mv_step(x, tmp_mv, &ref_mv, cpi->common.allow_high_precision_mv, x->errorperbit, &cpi->fn_ptr[bsize], @@ -267,7 +267,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, continue; sub_pixel_motion_search(cpi, x, tile, bsize, mi_row, mi_col, - &frame_mv[NEWMV][ref_frame]); + &frame_mv[NEWMV][ref_frame].as_mv); } mbmi->mode = this_mode; |