Commit 60866b03 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Making speed checks consistent in set_rt_speed_feature()."

parents e14f900a d262cda5
...@@ -156,7 +156,7 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, ...@@ -156,7 +156,7 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
sf->adaptive_rd_thresh = 1; sf->adaptive_rd_thresh = 1;
sf->use_fast_coef_costing = 1; sf->use_fast_coef_costing = 1;
if (speed == 1) { if (speed >= 1) {
sf->use_square_partition_only = !frame_is_intra_only(cm); sf->use_square_partition_only = !frame_is_intra_only(cm);
sf->less_rectangular_check = 1; sf->less_rectangular_check = 1;
sf->tx_size_search_method = frame_is_intra_only(cm) ? USE_FULL_RD sf->tx_size_search_method = frame_is_intra_only(cm) ? USE_FULL_RD
...@@ -179,13 +179,9 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, ...@@ -179,13 +179,9 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
} }
if (speed >= 2) { if (speed >= 2) {
sf->use_square_partition_only = !frame_is_intra_only(cm);
sf->less_rectangular_check = 1;
sf->tx_size_search_method = frame_is_intra_only(cm) ? USE_FULL_RD
: USE_LARGESTALL;
if (MIN(cm->width, cm->height) >= 720) if (MIN(cm->width, cm->height) >= 720)
sf->disable_split_mask = cm->show_frame ? sf->disable_split_mask = cm->show_frame ? DISABLE_ALL_SPLIT
DISABLE_ALL_SPLIT : DISABLE_ALL_INTER_SPLIT; : DISABLE_ALL_INTER_SPLIT;
else else
sf->disable_split_mask = LAST_AND_INTRA_SPLIT_ONLY; sf->disable_split_mask = LAST_AND_INTRA_SPLIT_ONLY;
...@@ -193,28 +189,18 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, ...@@ -193,28 +189,18 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
FLAG_SKIP_INTRA_BESTINTER | FLAG_SKIP_INTRA_BESTINTER |
FLAG_SKIP_COMP_BESTINTRA | FLAG_SKIP_COMP_BESTINTRA |
FLAG_SKIP_INTRA_LOWVAR; FLAG_SKIP_INTRA_LOWVAR;
sf->use_rd_breakout = 1;
sf->adaptive_motion_search = 1;
sf->adaptive_pred_interp_filter = 2; sf->adaptive_pred_interp_filter = 2;
sf->auto_mv_step_size = 1;
sf->reference_masking = 1; sf->reference_masking = 1;
sf->disable_filter_search_var_thresh = 50; sf->disable_filter_search_var_thresh = 50;
sf->comp_inter_joint_search_thresh = BLOCK_SIZES; sf->comp_inter_joint_search_thresh = BLOCK_SIZES;
sf->auto_min_max_partition_size = RELAXED_NEIGHBORING_MIN_MAX; sf->auto_min_max_partition_size = RELAXED_NEIGHBORING_MIN_MAX;
sf->use_lastframe_partitioning = LAST_FRAME_PARTITION_LOW_MOTION; sf->use_lastframe_partitioning = LAST_FRAME_PARTITION_LOW_MOTION;
sf->lf_motion_threshold = LOW_MOITION_THRESHOLD; sf->lf_motion_threshold = LOW_MOITION_THRESHOLD;
sf->adjust_partitioning_from_last_frame = 1; sf->adjust_partitioning_from_last_frame = 1;
sf->last_partitioning_redo_frequency = 3; sf->last_partitioning_redo_frequency = 3;
sf->adaptive_rd_thresh = 2;
sf->use_lp32x32fdct = 1; sf->use_lp32x32fdct = 1;
sf->mode_skip_start = 11; sf->mode_skip_start = 11;
sf->intra_y_mode_mask[TX_32X32] = INTRA_DC_H_V;
sf->intra_y_mode_mask[TX_16X16] = INTRA_DC_H_V; sf->intra_y_mode_mask[TX_16X16] = INTRA_DC_H_V;
sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC_H_V;
sf->intra_uv_mode_mask[TX_16X16] = INTRA_DC_H_V;
} }
if (speed >= 3) { if (speed >= 3) {
......
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