diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-05-07 14:07:33 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-07 14:07:33 -0700 |
| commit | e91616a5d48ce4b20216a775f3338660d63327b4 (patch) | |
| tree | 72484c22bd2854e538a58cdff4d77e587a3bce2c /vp9/encoder/vp9_rdopt.c | |
| parent | 68a600d82a1071adf9bb165aaf7bf420431b0c04 (diff) | |
| parent | 7d9d5df26366c3ffa5676e8e194b6281353c124a (diff) | |
| download | libvpx-e91616a5d48ce4b20216a775f3338660d63327b4.tar libvpx-e91616a5d48ce4b20216a775f3338660d63327b4.tar.gz libvpx-e91616a5d48ce4b20216a775f3338660d63327b4.tar.bz2 libvpx-e91616a5d48ce4b20216a775f3338660d63327b4.zip | |
Merge "Using SPEED_FEATURES instead of VP9_COMP in vp9_init_search_range()."
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index b9cd7d554..f4def1eef 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1833,8 +1833,8 @@ static int64_t rd_pick_best_sub8x8_mode(VP9_COMP *cpi, MACROBLOCK *x, // Take wtd average of the step_params based on the last frame's // max mv magnitude and the best ref mvs of the current block for // the given reference. - step_param = (vp9_init_search_range(cpi, max_mv) + - cpi->mv_step_param) >> 1; + step_param = (vp9_init_search_range(&cpi->sf, max_mv) + + cpi->mv_step_param) / 2; } else { step_param = cpi->mv_step_param; } @@ -2352,8 +2352,8 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x, // Take wtd average of the step_params based on the last frame's // max mv magnitude and that based on the best ref mvs of the current // block for the given reference. - step_param = (vp9_init_search_range(cpi, x->max_mv_context[ref]) + - cpi->mv_step_param) >> 1; + step_param = (vp9_init_search_range(&cpi->sf, x->max_mv_context[ref]) + + cpi->mv_step_param) / 2; } else { step_param = cpi->mv_step_param; } |