Remove an unused mv speed feature Change-Id: Iabef0b025304139b2894f1bf877bf49ce7c41b04
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c index 76ec863..f7ba40b 100644 --- a/av1/encoder/speed_features.c +++ b/av1/encoder/speed_features.c
@@ -680,7 +680,6 @@ sf->intra_uv_mode_mask[i] = UV_INTRA_DC_CFL; } sf->partition_search_breakout_rate_thr = 500; - sf->mv.reduce_first_step_size = 1; sf->simple_model_rd_from_var = 1; sf->lpf_pick = LPF_PICK_FROM_Q; sf->mv.subpel_force_stop = QUARTER_PEL; @@ -804,7 +803,6 @@ } sf->gm_erroradv_type = GM_ERRORADV_TR_0; sf->disable_adaptive_warp_error_thresh = 1; - sf->mv.reduce_first_step_size = 0; sf->mv.auto_mv_step_size = 0; sf->comp_inter_joint_search_thresh = BLOCK_4X4; sf->adaptive_rd_thresh = 0;
diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h index 636a136..8a7823f 100644 --- a/av1/encoder/speed_features.h +++ b/av1/encoder/speed_features.h
@@ -226,10 +226,6 @@ // Motion search method (Diamond, NSTEP, Hex, Big Diamond, Square, etc). SEARCH_METHODS search_method; - // This parameter controls which step in the n-step process we start at. - // It's changed adaptively based on circumstances. - int reduce_first_step_size; - // If this is set to 1, we limit the motion search range to 2 times the // largest motion vector found in the last frame. int auto_mv_step_size;
diff --git a/av1/encoder/tpl_model.c b/av1/encoder/tpl_model.c index 95bd703..6728bfa 100644 --- a/av1/encoder/tpl_model.c +++ b/av1/encoder/tpl_model.c
@@ -138,7 +138,7 @@ xd->plane[0].pre[0].buf = ref_frame_buf; xd->plane[0].pre[0].stride = stride_ref; - step_param = mv_sf->reduce_first_step_size + tpl_sf->reduce_first_step_size; + step_param = tpl_sf->reduce_first_step_size; step_param = AOMMIN(step_param, MAX_MVSEARCH_STEPS - 2); av1_set_mv_search_range(&x->mv_limits, &best_ref_mv1);