Commit 84744a49 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review

Merge "Remove an unused parameter in vp9_init_search_range()"

parents af4f390f 6673d2f3
...@@ -2096,7 +2096,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, ...@@ -2096,7 +2096,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
cm->lf.mode_ref_delta_update = 0; cm->lf.mode_ref_delta_update = 0;
// Initialize cpi->mv_step_param to default based on max resolution. // Initialize cpi->mv_step_param to default based on max resolution.
cpi->mv_step_param = vp9_init_search_range(sf, max_mv_def); cpi->mv_step_param = vp9_init_search_range(max_mv_def);
// Initialize cpi->max_mv_magnitude and cpi->mv_step_param if appropriate. // Initialize cpi->max_mv_magnitude and cpi->mv_step_param if appropriate.
if (sf->mv.auto_mv_step_size) { if (sf->mv.auto_mv_step_size) {
if (frame_is_intra_only(cm)) { if (frame_is_intra_only(cm)) {
...@@ -2108,7 +2108,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, ...@@ -2108,7 +2108,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
// Allow mv_steps to correspond to twice the max mv magnitude found // Allow mv_steps to correspond to twice the max mv magnitude found
// in the previous frame, capped by the default max_mv_magnitude based // in the previous frame, capped by the default max_mv_magnitude based
// on resolution. // on resolution.
cpi->mv_step_param = vp9_init_search_range(sf, MIN(max_mv_def, 2 * cpi->mv_step_param = vp9_init_search_range(MIN(max_mv_def, 2 *
cpi->max_mv_magnitude)); cpi->max_mv_magnitude));
cpi->max_mv_magnitude = 0; cpi->max_mv_magnitude = 0;
} }
......
...@@ -51,9 +51,8 @@ void vp9_set_mv_search_range(MACROBLOCK *x, const MV *mv) { ...@@ -51,9 +51,8 @@ void vp9_set_mv_search_range(MACROBLOCK *x, const MV *mv) {
x->mv_row_max = row_max; x->mv_row_max = row_max;
} }
int vp9_init_search_range(const SPEED_FEATURES *sf, int size) { int vp9_init_search_range(int size) {
int sr = 0; int sr = 0;
// Minimum search size no matter what the passed in value. // Minimum search size no matter what the passed in value.
size = MAX(16, size); size = MAX(16, size);
......
...@@ -64,7 +64,7 @@ int vp9_get_mvpred_av_var(const MACROBLOCK *x, ...@@ -64,7 +64,7 @@ int vp9_get_mvpred_av_var(const MACROBLOCK *x,
struct VP9_COMP; struct VP9_COMP;
struct SPEED_FEATURES; struct SPEED_FEATURES;
int vp9_init_search_range(const struct SPEED_FEATURES *sf, int size); int vp9_init_search_range(int size);
// Runs sequence of diamond searches in smaller steps for RD // Runs sequence of diamond searches in smaller steps for RD
int vp9_full_pixel_diamond(const struct VP9_COMP *cpi, MACROBLOCK *x, int vp9_full_pixel_diamond(const struct VP9_COMP *cpi, MACROBLOCK *x,
......
...@@ -1367,7 +1367,7 @@ static int64_t rd_pick_best_sub8x8_mode(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -1367,7 +1367,7 @@ 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 // 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 // max mv magnitude and the best ref mvs of the current block for
// the given reference. // the given reference.
step_param = (vp9_init_search_range(&cpi->sf, max_mv) + step_param = (vp9_init_search_range(max_mv) +
cpi->mv_step_param) / 2; cpi->mv_step_param) / 2;
} else { } else {
step_param = cpi->mv_step_param; step_param = cpi->mv_step_param;
...@@ -1779,7 +1779,7 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -1779,7 +1779,7 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
// Take wtd average of the step_params based on the last frame's // 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 // max mv magnitude and that based on the best ref mvs of the current
// block for the given reference. // block for the given reference.
step_param = (vp9_init_search_range(&cpi->sf, x->max_mv_context[ref]) + step_param = (vp9_init_search_range(x->max_mv_context[ref]) +
cpi->mv_step_param) / 2; cpi->mv_step_param) / 2;
} else { } else {
step_param = cpi->mv_step_param; step_param = cpi->mv_step_param;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment