diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2014-02-28 08:29:02 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-28 08:29:02 -0800 |
| commit | 17b1e92d6cdf2fbb9ae984b6d36465d3c9b7b3f3 (patch) | |
| tree | ff2c5e03bad18132059fbd62831e81c0558d8428 /vp9/encoder/vp9_pickmode.c | |
| parent | 44078390ff47ee7084a327cddcacc9e6a594477a (diff) | |
| parent | e6fd071243f83dab27b9028ee75b3424664eb72a (diff) | |
| download | libvpx-17b1e92d6cdf2fbb9ae984b6d36465d3c9b7b3f3.tar libvpx-17b1e92d6cdf2fbb9ae984b6d36465d3c9b7b3f3.tar.gz libvpx-17b1e92d6cdf2fbb9ae984b6d36465d3c9b7b3f3.tar.bz2 libvpx-17b1e92d6cdf2fbb9ae984b6d36465d3c9b7b3f3.zip | |
Merge "Enable using fast HEX search in non-rd pick mode"
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 0b92df002..87f20fa1c 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -98,8 +98,15 @@ static int full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x, mvp_full.col >>= 3; mvp_full.row >>= 3; - vp9_full_pixel_diamond(cpi, x, &mvp_full, step_param, sadpb, further_steps, 1, - &cpi->fn_ptr[bsize], &ref_mv.as_mv, &tmp_mv->as_mv); + if (cpi->sf.search_method == FAST_HEX) { + vp9_fast_hex_search(x, &mvp_full, step_param, sadpb, &cpi->fn_ptr[bsize], + 1, &ref_mv.as_mv, &tmp_mv->as_mv); + } else { + vp9_full_pixel_diamond(cpi, x, &mvp_full, step_param, sadpb, further_steps, + 1, &cpi->fn_ptr[bsize], &ref_mv.as_mv, + &tmp_mv->as_mv); + } + x->mv_col_min = tmp_col_min; x->mv_col_max = tmp_col_max; x->mv_row_min = tmp_row_min; |