Index: source/libvpx/vp9/encoder/vp9_speed_features.c |
=================================================================== |
--- source/libvpx/vp9/encoder/vp9_speed_features.c (revision 278778) |
+++ source/libvpx/vp9/encoder/vp9_speed_features.c (working copy) |
@@ -14,20 +14,23 @@ |
#include "vp9/encoder/vp9_speed_features.h" |
enum { |
- ALL_INTRA_MODES = (1 << DC_PRED) | |
+ INTRA_ALL = (1 << DC_PRED) | |
(1 << V_PRED) | (1 << H_PRED) | |
(1 << D45_PRED) | (1 << D135_PRED) | |
(1 << D117_PRED) | (1 << D153_PRED) | |
(1 << D207_PRED) | (1 << D63_PRED) | |
(1 << TM_PRED), |
- |
- INTRA_DC_ONLY = (1 << DC_PRED), |
- |
- INTRA_DC_TM = (1 << TM_PRED) | (1 << DC_PRED), |
- |
+ INTRA_DC = (1 << DC_PRED), |
+ INTRA_DC_TM = (1 << DC_PRED) | (1 << TM_PRED), |
INTRA_DC_H_V = (1 << DC_PRED) | (1 << V_PRED) | (1 << H_PRED), |
+ INTRA_DC_TM_H_V = (1 << DC_PRED) | (1 << TM_PRED) | (1 << V_PRED) | |
+ (1 << H_PRED) |
+}; |
- INTRA_DC_TM_H_V = INTRA_DC_TM | (1 << V_PRED) | (1 << H_PRED) |
+enum { |
+ INTER_ALL = (1 << NEARESTMV) | (1 << NEARMV) | (1 << ZEROMV) | (1 << NEWMV), |
+ INTER_NEAREST = (1 << NEARESTMV), |
+ INTER_NEAREST_NEAR_NEW = (1 << NEARESTMV) | (1 << NEARMV) | (1 << NEWMV) |
}; |
enum { |
@@ -66,9 +69,9 @@ |
sf->disable_split_mask = DISABLE_COMPOUND_SPLIT; |
sf->use_rd_breakout = 1; |
sf->adaptive_motion_search = 1; |
- sf->auto_mv_step_size = 1; |
+ sf->mv.auto_mv_step_size = 1; |
sf->adaptive_rd_thresh = 2; |
- sf->subpel_iters_per_step = 1; |
+ sf->mv.subpel_iters_per_step = 1; |
sf->mode_skip_start = 10; |
sf->adaptive_pred_interp_filter = 1; |
@@ -80,12 +83,16 @@ |
} |
if (speed >= 2) { |
- if (MIN(cm->width, cm->height) >= 720) |
+ if (MIN(cm->width, cm->height) >= 720) { |
+ sf->lf_motion_threshold = LOW_MOITION_THRESHOLD; |
+ sf->last_partitioning_redo_frequency = 3; |
sf->disable_split_mask = cm->show_frame ? DISABLE_ALL_SPLIT |
: DISABLE_ALL_INTER_SPLIT; |
- else |
+ } else { |
sf->disable_split_mask = LAST_AND_INTRA_SPLIT_ONLY; |
- |
+ sf->last_partitioning_redo_frequency = 2; |
+ sf->lf_motion_threshold = NO_MOITION_THRESHOLD; |
+ } |
sf->adaptive_pred_interp_filter = 2; |
sf->reference_masking = 1; |
sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH | |
@@ -97,7 +104,6 @@ |
sf->auto_min_max_partition_size = RELAXED_NEIGHBORING_MIN_MAX; |
sf->use_lastframe_partitioning = LAST_FRAME_PARTITION_LOW_MOTION; |
sf->adjust_partitioning_from_last_frame = 1; |
- sf->last_partitioning_redo_frequency = 3; |
} |
if (speed >= 3) { |
@@ -108,6 +114,8 @@ |
else |
sf->disable_split_mask = DISABLE_ALL_INTER_SPLIT; |
+ sf->lf_motion_threshold = LOW_MOITION_THRESHOLD; |
+ sf->last_partitioning_redo_frequency = 3; |
sf->recode_loop = ALLOW_RECODE_KFMAXBW; |
sf->adaptive_rd_thresh = 3; |
sf->mode_skip_start = 6; |
@@ -132,24 +140,26 @@ |
sf->partition_search_type = FIXED_PARTITION; |
sf->optimize_coefficients = 0; |
- sf->search_method = HEX; |
+ sf->mv.search_method = HEX; |
sf->disable_filter_search_var_thresh = 500; |
for (i = 0; i < TX_SIZES; ++i) { |
- sf->intra_y_mode_mask[i] = INTRA_DC_ONLY; |
- sf->intra_uv_mode_mask[i] = INTRA_DC_ONLY; |
+ sf->intra_y_mode_mask[i] = INTRA_DC; |
+ sf->intra_uv_mode_mask[i] = INTRA_DC; |
} |
cpi->allow_encode_breakout = ENCODE_BREAKOUT_ENABLED; |
} |
} |
-static void set_rt_speed_feature(VP9_COMMON *cm, SPEED_FEATURES *sf, |
+static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, |
int speed) { |
+ VP9_COMMON *const cm = &cpi->common; |
+ const int frames_since_key = |
+ cm->frame_type == KEY_FRAME ? 0 : cpi->rc.frames_since_key; |
sf->static_segmentation = 0; |
sf->adaptive_rd_thresh = 1; |
- sf->encode_breakout_thresh = 1; |
sf->use_fast_coef_costing = 1; |
- if (speed == 1) { |
+ if (speed >= 1) { |
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 |
@@ -164,22 +174,17 @@ |
sf->use_rd_breakout = 1; |
sf->adaptive_motion_search = 1; |
sf->adaptive_pred_interp_filter = 1; |
- sf->auto_mv_step_size = 1; |
+ sf->mv.auto_mv_step_size = 1; |
sf->adaptive_rd_thresh = 2; |
sf->intra_y_mode_mask[TX_32X32] = 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; |
- sf->encode_breakout_thresh = 8; |
} |
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) |
- sf->disable_split_mask = cm->show_frame ? |
- DISABLE_ALL_SPLIT : DISABLE_ALL_INTER_SPLIT; |
+ sf->disable_split_mask = cm->show_frame ? DISABLE_ALL_SPLIT |
+ : DISABLE_ALL_INTER_SPLIT; |
else |
sf->disable_split_mask = LAST_AND_INTRA_SPLIT_ONLY; |
@@ -187,28 +192,18 @@ |
FLAG_SKIP_INTRA_BESTINTER | |
FLAG_SKIP_COMP_BESTINTRA | |
FLAG_SKIP_INTRA_LOWVAR; |
- sf->use_rd_breakout = 1; |
- sf->adaptive_motion_search = 1; |
sf->adaptive_pred_interp_filter = 2; |
- sf->auto_mv_step_size = 1; |
sf->reference_masking = 1; |
- |
sf->disable_filter_search_var_thresh = 50; |
sf->comp_inter_joint_search_thresh = BLOCK_SIZES; |
- |
sf->auto_min_max_partition_size = RELAXED_NEIGHBORING_MIN_MAX; |
sf->use_lastframe_partitioning = LAST_FRAME_PARTITION_LOW_MOTION; |
+ sf->lf_motion_threshold = LOW_MOITION_THRESHOLD; |
sf->adjust_partitioning_from_last_frame = 1; |
sf->last_partitioning_redo_frequency = 3; |
- |
- sf->adaptive_rd_thresh = 2; |
sf->use_lp32x32fdct = 1; |
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_uv_mode_mask[TX_32X32] = INTRA_DC_H_V; |
- sf->intra_uv_mode_mask[TX_16X16] = INTRA_DC_H_V; |
- sf->encode_breakout_thresh = 200; |
} |
if (speed >= 3) { |
@@ -218,7 +213,7 @@ |
sf->constrain_copy_partition = 1; |
sf->use_uv_intra_rd_estimate = 1; |
sf->skip_encode_sb = 1; |
- sf->subpel_iters_per_step = 1; |
+ sf->mv.subpel_iters_per_step = 1; |
sf->use_fast_coef_updates = ONE_LOOP_REDUCED; |
sf->adaptive_rd_thresh = 4; |
sf->mode_skip_start = 6; |
@@ -226,7 +221,6 @@ |
sf->optimize_coefficients = 0; |
sf->disable_split_mask = DISABLE_ALL_SPLIT; |
sf->lpf_pick = LPF_PICK_FROM_Q; |
- sf->encode_breakout_thresh = 700; |
} |
if (speed >= 4) { |
@@ -237,38 +231,38 @@ |
sf->auto_min_max_partition_size = STRICT_NEIGHBORING_MIN_MAX; |
sf->adjust_partitioning_from_last_frame = |
cm->last_frame_type != cm->frame_type || (0 == |
- (cm->current_video_frame + 1) % sf->last_partitioning_redo_frequency); |
- sf->subpel_force_stop = 1; |
+ (frames_since_key + 1) % sf->last_partitioning_redo_frequency); |
+ sf->mv.subpel_force_stop = 1; |
for (i = 0; i < TX_SIZES; i++) { |
sf->intra_y_mode_mask[i] = INTRA_DC_H_V; |
- sf->intra_uv_mode_mask[i] = INTRA_DC_ONLY; |
+ sf->intra_uv_mode_mask[i] = INTRA_DC; |
} |
- sf->intra_y_mode_mask[TX_32X32] = INTRA_DC_ONLY; |
+ sf->intra_y_mode_mask[TX_32X32] = INTRA_DC; |
sf->frame_parameter_update = 0; |
- sf->encode_breakout_thresh = 1000; |
- sf->search_method = FAST_HEX; |
- sf->disable_inter_mode_mask[BLOCK_32X32] = 1 << INTER_OFFSET(ZEROMV); |
- sf->disable_inter_mode_mask[BLOCK_32X64] = ~(1 << INTER_OFFSET(NEARESTMV)); |
- sf->disable_inter_mode_mask[BLOCK_64X32] = ~(1 << INTER_OFFSET(NEARESTMV)); |
- sf->disable_inter_mode_mask[BLOCK_64X64] = ~(1 << INTER_OFFSET(NEARESTMV)); |
+ sf->mv.search_method = FAST_HEX; |
+ sf->inter_mode_mask[BLOCK_32X32] = INTER_NEAREST_NEAR_NEW; |
+ sf->inter_mode_mask[BLOCK_32X64] = INTER_NEAREST; |
+ sf->inter_mode_mask[BLOCK_64X32] = INTER_NEAREST; |
+ sf->inter_mode_mask[BLOCK_64X64] = INTER_NEAREST; |
sf->max_intra_bsize = BLOCK_32X32; |
sf->allow_skip_recode = 1; |
} |
if (speed >= 5) { |
+ sf->auto_min_max_partition_size = (cm->frame_type == KEY_FRAME) ? |
+ RELAXED_NEIGHBORING_MIN_MAX : STRICT_NEIGHBORING_MIN_MAX; |
sf->max_partition_size = BLOCK_32X32; |
sf->min_partition_size = BLOCK_8X8; |
sf->partition_check = |
- (cm->current_video_frame % sf->last_partitioning_redo_frequency == 1); |
+ (frames_since_key % sf->last_partitioning_redo_frequency == 1); |
sf->force_frame_boost = cm->frame_type == KEY_FRAME || |
- (cm->current_video_frame % |
+ (frames_since_key % |
(sf->last_partitioning_redo_frequency << 1) == 1); |
sf->max_delta_qindex = (cm->frame_type == KEY_FRAME) ? 20 : 15; |
sf->partition_search_type = REFERENCE_PARTITION; |
sf->use_nonrd_pick_mode = 1; |
- sf->search_method = FAST_DIAMOND; |
+ sf->mv.search_method = FAST_DIAMOND; |
sf->allow_skip_recode = 0; |
- sf->chessboard_index = cm->current_video_frame & 0x01; |
} |
if (speed >= 6) { |
@@ -276,12 +270,18 @@ |
sf->partition_search_type = SOURCE_VAR_BASED_PARTITION; |
sf->search_type_check_frequency = 50; |
sf->source_var_thresh = 360; |
+ |
+ sf->tx_size_search_method = USE_TX_8X8; |
+ // TODO(yunqingwang): max_intra_bsize is used to decide if DC_PRED mode |
+ // is checked for a partition block. Later, we can try to allow large |
+ // partitions to do intra mode checking. |
+ sf->max_intra_bsize = BLOCK_8X8; |
} |
if (speed >= 7) { |
int i; |
for (i = 0; i < BLOCK_SIZES; ++i) |
- sf->disable_inter_mode_mask[i] = ~(1 << INTER_OFFSET(NEARESTMV)); |
+ sf->inter_mode_mask[i] = INTER_NEAREST; |
} |
} |
@@ -293,15 +293,15 @@ |
// best quality defaults |
sf->frame_parameter_update = 1; |
- sf->search_method = NSTEP; |
+ sf->mv.search_method = NSTEP; |
sf->recode_loop = ALLOW_RECODE; |
- sf->subpel_search_method = SUBPEL_TREE; |
- sf->subpel_iters_per_step = 2; |
- sf->subpel_force_stop = 0; |
- sf->optimize_coefficients = !oxcf->lossless; |
- sf->reduce_first_step_size = 0; |
- sf->auto_mv_step_size = 0; |
- sf->max_step_search_steps = MAX_MVSEARCH_STEPS; |
+ sf->mv.subpel_search_method = SUBPEL_TREE; |
+ sf->mv.subpel_iters_per_step = 2; |
+ sf->mv.subpel_force_stop = 0; |
+ sf->optimize_coefficients = !is_lossless_requested(&cpi->oxcf); |
+ sf->mv.reduce_first_step_size = 0; |
+ sf->mv.auto_mv_step_size = 0; |
+ sf->mv.max_step_search_steps = MAX_MVSEARCH_STEPS; |
sf->comp_inter_joint_search_thresh = BLOCK_4X4; |
sf->adaptive_rd_thresh = 0; |
sf->use_lastframe_partitioning = LAST_FRAME_PARTITION_OFF; |
@@ -326,8 +326,8 @@ |
sf->disable_split_var_thresh = 0; |
sf->disable_filter_search_var_thresh = 0; |
for (i = 0; i < TX_SIZES; i++) { |
- sf->intra_y_mode_mask[i] = ALL_INTRA_MODES; |
- sf->intra_uv_mode_mask[i] = ALL_INTRA_MODES; |
+ sf->intra_y_mode_mask[i] = INTRA_ALL; |
+ sf->intra_uv_mode_mask[i] = INTRA_ALL; |
} |
sf->use_rd_breakout = 0; |
sf->skip_encode_sb = 0; |
@@ -338,9 +338,8 @@ |
sf->use_fast_coef_costing = 0; |
sf->mode_skip_start = MAX_MODES; // Mode index at which mode skip mask set |
sf->use_nonrd_pick_mode = 0; |
- sf->encode_breakout_thresh = 0; |
for (i = 0; i < BLOCK_SIZES; ++i) |
- sf->disable_inter_mode_mask[i] = 0; |
+ sf->inter_mode_mask[i] = INTER_ALL; |
sf->max_intra_bsize = BLOCK_64X64; |
// This setting only takes effect when partition_search_type is set |
// to FIXED_PARTITION. |
@@ -362,7 +361,7 @@ |
set_good_speed_feature(cpi, cm, sf, oxcf->speed); |
break; |
case REALTIME: |
- set_rt_speed_feature(cm, sf, oxcf->speed); |
+ set_rt_speed_feature(cpi, sf, oxcf->speed); |
break; |
} |
@@ -377,17 +376,13 @@ |
sf->optimize_coefficients = 0; |
} |
- if (sf->subpel_search_method == SUBPEL_TREE) { |
+ if (sf->mv.subpel_search_method == SUBPEL_TREE) { |
cpi->find_fractional_mv_step = vp9_find_best_sub_pixel_tree; |
cpi->find_fractional_mv_step_comp = vp9_find_best_sub_pixel_comp_tree; |
} |
cpi->mb.optimize = sf->optimize_coefficients == 1 && cpi->pass != 1; |
- if (cpi->encode_breakout && oxcf->mode == REALTIME && |
- sf->encode_breakout_thresh > cpi->encode_breakout) |
- cpi->encode_breakout = sf->encode_breakout_thresh; |
- |
if (sf->disable_split_mask == DISABLE_ALL_SPLIT) |
sf->adaptive_pred_interp_filter = 0; |