| Index: source/libvpx/vp8/common/findnearmv.c
|
| ===================================================================
|
| --- source/libvpx/vp8/common/findnearmv.c (revision 96967)
|
| +++ source/libvpx/vp8/common/findnearmv.c (working copy)
|
| @@ -25,9 +25,9 @@
|
| (
|
| MACROBLOCKD *xd,
|
| const MODE_INFO *here,
|
| - MV *nearest,
|
| - MV *nearby,
|
| - MV *best_mv,
|
| + int_mv *nearest,
|
| + int_mv *nearby,
|
| + int_mv *best_mv,
|
| int cnt[4],
|
| int refframe,
|
| int *ref_frame_sign_bias
|
| @@ -131,13 +131,14 @@
|
| near_mvs[CNT_INTRA] = near_mvs[CNT_NEAREST];
|
|
|
| /* Set up return values */
|
| - *best_mv = near_mvs[0].as_mv;
|
| - *nearest = near_mvs[CNT_NEAREST].as_mv;
|
| - *nearby = near_mvs[CNT_NEAR].as_mv;
|
| + best_mv->as_int = near_mvs[0].as_int;
|
| + nearest->as_int = near_mvs[CNT_NEAREST].as_int;
|
| + nearby->as_int = near_mvs[CNT_NEAR].as_int;
|
|
|
| - vp8_clamp_mv(nearest, xd);
|
| - vp8_clamp_mv(nearby, xd);
|
| - vp8_clamp_mv(best_mv, xd); /*TODO: move this up before the copy*/
|
| + //TODO: move clamp outside findnearmv
|
| + vp8_clamp_mv2(nearest, xd);
|
| + vp8_clamp_mv2(nearby, xd);
|
| + vp8_clamp_mv2(best_mv, xd);
|
| }
|
|
|
| vp8_prob *vp8_mv_ref_probs(
|
| @@ -152,26 +153,3 @@
|
| return p;
|
| }
|
|
|
| -const B_MODE_INFO *vp8_left_bmi(const MODE_INFO *cur_mb, int b)
|
| -{
|
| - if (!(b & 3))
|
| - {
|
| - /* On L edge, get from MB to left of us */
|
| - --cur_mb;
|
| - b += 4;
|
| - }
|
| -
|
| - return cur_mb->bmi + b - 1;
|
| -}
|
| -
|
| -const B_MODE_INFO *vp8_above_bmi(const MODE_INFO *cur_mb, int b, int mi_stride)
|
| -{
|
| - if (!(b >> 2))
|
| - {
|
| - /* On top edge, get from MB above us */
|
| - cur_mb -= mi_stride;
|
| - b += 16;
|
| - }
|
| -
|
| - return cur_mb->bmi + b - 4;
|
| -}
|
|
|