From f60a1178c6329c15c675ea52606c311be7c53601 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Tue, 1 Jul 2014 13:02:05 -0700 Subject: Cleanup motion search speed features. * Replace max_step_search_steps with constant MAX_MVSEARCH_STEPS * Fold (reduce_first_step_size + speed > 5) into reduce_first_step_size replacing uses of reduce_first_step_size that don't add the speed check with zero. Change-Id: Iae46395dbf3eaca138bf4d18b838a9e364b5a198 --- vp9/encoder/vp9_mcomp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'vp9/encoder/vp9_mcomp.c') diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index cb45dfae3..c0edf45a7 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -60,8 +60,7 @@ int vp9_init_search_range(const SPEED_FEATURES *sf, int size) { while ((size << sr) < MAX_FULL_PEL_VAL) sr++; - sr += sf->mv.reduce_first_step_size; - sr = MIN(sr, (sf->mv.max_step_search_steps - 2)); + sr = MIN(sr, MAX_MVSEARCH_STEPS - 2); return sr; } @@ -1627,8 +1626,7 @@ int vp9_full_pixel_search(VP9_COMP *cpi, MACROBLOCK *x, break; case NSTEP: var = vp9_full_pixel_diamond(cpi, x, mvp_full, step_param, error_per_bit, - (sf->mv.max_step_search_steps - 1) - - step_param, + MAX_MVSEARCH_STEPS - 1 - step_param, 1, fn_ptr, ref_mv, tmp_mv); break; default: -- cgit v1.2.3