diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2015-08-13 15:00:32 -0700 |
|---|---|---|
| committer | Yunqing Wang <yunqingwang@google.com> | 2015-08-13 15:00:32 -0700 |
| commit | 0ea70f77a5b2f0db3697f3b4fc77f6a922b194ac (patch) | |
| tree | 7c26e29e602c973360c794554d83a8444474bb4f | |
| parent | 62bfc97d056c716c021b9a00b703b39c41977cb9 (diff) | |
| download | libvpx-0ea70f77a5b2f0db3697f3b4fc77f6a922b194ac.tar.gz | |
Copy VP9 second-level sub-pixel search change to VP10
Merged patch "Improve the second-level sub-pixel motion search"
(commit: 7418b176ce1c985637c639280d70b12bdc850e57) to VP10.
Change-Id: I89b5d76624290c47dd84d9c5332b4909238e268d
| -rw-r--r-- | vp10/encoder/mcomp.c | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/vp10/encoder/mcomp.c b/vp10/encoder/mcomp.c index 0daa0ee0e..cad37ea6e 100644 --- a/vp10/encoder/mcomp.c +++ b/vp10/encoder/mcomp.c @@ -256,6 +256,27 @@ static INLINE const uint8_t *pre(const uint8_t *buf, int stride, int r, int c) { } \ } +// TODO(yunqingwang): SECOND_LEVEL_CHECKS_BEST was a rewrote of +// SECOND_LEVEL_CHECKS, and SECOND_LEVEL_CHECKS should be rewritten +// later in the same way. +#define SECOND_LEVEL_CHECKS_BEST \ + { \ + unsigned int second; \ + int br0 = br; \ + int bc0 = bc; \ + assert(tr == br || tc == bc); \ + if (tr == br && tc != bc) { \ + kc = bc - tc; \ + } else if (tr != br && tc == bc) { \ + kr = br - tr; \ + } \ + CHECK_BETTER(second, br0 + kr, bc0); \ + CHECK_BETTER(second, br0, bc0 + kc); \ + if (br0 != br || bc0 != bc) { \ + CHECK_BETTER(second, br0 + kr, bc0 + kc); \ + } \ + } + #define SETUP_SUBPEL_SEARCH \ const uint8_t *const z = x->plane[0].src.buf; \ const int src_stride = x->plane[0].src.stride; \ @@ -636,7 +657,6 @@ int vp10_find_best_sub_pixel_tree(const MACROBLOCK *x, const MACROBLOCKD *xd = &x->e_mbd; unsigned int besterr = INT_MAX; unsigned int sse; - unsigned int whichdir = 0; int thismse; const int y_stride = xd->plane[0].pre[0].stride; const int offset = bestmv->row * y_stride + bestmv->col; @@ -657,6 +677,7 @@ int vp10_find_best_sub_pixel_tree(const MACROBLOCK *x, const MV *search_step = search_step_table; int idx, best_idx = -1; unsigned int cost_array[5]; + int kr, kc; if (!(allow_hp && vp10_use_mv_hp(ref_mv))) if (round == 3) @@ -703,8 +724,11 @@ int vp10_find_best_sub_pixel_tree(const MACROBLOCK *x, } // Check diagonal sub-pixel position - tc = bc + (cost_array[0] <= cost_array[1] ? -hstep : hstep); - tr = br + (cost_array[2] <= cost_array[3] ? -hstep : hstep); + kc = (cost_array[0] <= cost_array[1] ? -hstep : hstep); + kr = (cost_array[2] <= cost_array[3] ? -hstep : hstep); + + tc = bc + kc; + tr = br + kr; if (tc >= minc && tc <= maxc && tr >= minr && tr <= maxr) { const uint8_t *const pre_address = y + (tr >> 3) * y_stride + (tc >> 3); MV this_mv = {tr, tc}; @@ -736,7 +760,7 @@ int vp10_find_best_sub_pixel_tree(const MACROBLOCK *x, } if (iters_per_step > 1 && best_idx != -1) - SECOND_LEVEL_CHECKS; + SECOND_LEVEL_CHECKS_BEST; tr = br; tc = bc; @@ -1704,7 +1728,7 @@ int vp10_diamond_search_sad_c(const MACROBLOCK *x, } } break; - }; + } #endif } else if (best_address == in_what) { (*num00)++; |