diff options
| author | Daniel Kang <ddkang@google.com> | 2012-08-09 16:07:41 -0700 |
|---|---|---|
| committer | Daniel Kang <ddkang@google.com> | 2012-08-10 09:40:10 -0700 |
| commit | 4d5b81a80faa8333ca3a7aed53684d2167fbebd2 (patch) | |
| tree | 9ee379a02819a9286e29172006036eb58c38b51b /vp8/common/findnearmv.c | |
| parent | bd9e5eceb8f0e29d8c17140e2c43594ee132243b (diff) | |
| download | libvpx-4d5b81a80faa8333ca3a7aed53684d2167fbebd2.tar libvpx-4d5b81a80faa8333ca3a7aed53684d2167fbebd2.tar.gz libvpx-4d5b81a80faa8333ca3a7aed53684d2167fbebd2.tar.bz2 libvpx-4d5b81a80faa8333ca3a7aed53684d2167fbebd2.zip | |
Refactor RD to take same codepath for single and comp pred
Change-Id: Id38baf1b89648ef534e28be72f583137871f920c
Diffstat (limited to 'vp8/common/findnearmv.c')
| -rw-r--r-- | vp8/common/findnearmv.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vp8/common/findnearmv.c b/vp8/common/findnearmv.c index 303893d9d..15a21b492 100644 --- a/vp8/common/findnearmv.c +++ b/vp8/common/findnearmv.c @@ -68,9 +68,9 @@ void vp8_find_near_mvs /* Process above */ if (above->mbmi.ref_frame != INTRA_FRAME) { - if (above->mbmi.mv.as_int) { + if (above->mbmi.mv[0].as_int) { ++ mv; - mv->as_int = above->mbmi.mv.as_int; + mv->as_int = above->mbmi.mv[0].as_int; mv_bias(ref_frame_sign_bias[above->mbmi.ref_frame], refframe, mv, ref_frame_sign_bias); #if CONFIG_NEWBESTREFMV @@ -83,9 +83,9 @@ void vp8_find_near_mvs /* Process left */ if (left->mbmi.ref_frame != INTRA_FRAME) { - if (left->mbmi.mv.as_int) { + if (left->mbmi.mv[0].as_int) { int_mv this_mv; - this_mv.as_int = left->mbmi.mv.as_int; + this_mv.as_int = left->mbmi.mv[0].as_int; mv_bias(ref_frame_sign_bias[left->mbmi.ref_frame], refframe, &this_mv, ref_frame_sign_bias); #if CONFIG_NEWBESTREFMV @@ -103,14 +103,14 @@ void vp8_find_near_mvs /* Process above left or the one from last frame */ if (aboveleft->mbmi.ref_frame != INTRA_FRAME || (lf_here->mbmi.ref_frame == LAST_FRAME && refframe == LAST_FRAME)) { - if (aboveleft->mbmi.mv.as_int) { + if (aboveleft->mbmi.mv[0].as_int) { third = aboveleft; #if CONFIG_NEWBESTREFMV ref_mv[2].as_int = aboveleft->mbmi.mv.as_int; mv_bias(ref_frame_sign_bias[aboveleft->mbmi.ref_frame], refframe, (ref_mv+2), ref_frame_sign_bias); #endif - } else if (lf_here->mbmi.mv.as_int) { + } else if (lf_here->mbmi.mv[0].as_int) { third = lf_here; } #if CONFIG_NEWBESTREFMV @@ -122,7 +122,7 @@ void vp8_find_near_mvs #endif if (third) { int_mv this_mv; - this_mv.as_int = third->mbmi.mv.as_int; + this_mv.as_int = third->mbmi.mv[0].as_int; mv_bias(ref_frame_sign_bias[third->mbmi.ref_frame], refframe, &this_mv, ref_frame_sign_bias); |