diff options
Diffstat (limited to 'third_party/aom/av1/encoder/speed_features.c')
-rw-r--r-- | third_party/aom/av1/encoder/speed_features.c | 354 |
1 files changed, 199 insertions, 155 deletions
diff --git a/third_party/aom/av1/encoder/speed_features.c b/third_party/aom/av1/encoder/speed_features.c index 5608d031e..49740817c 100644 --- a/third_party/aom/av1/encoder/speed_features.c +++ b/third_party/aom/av1/encoder/speed_features.c @@ -17,6 +17,12 @@ #include "aom_dsp/aom_dsp_common.h" +// Setting this to 1 will disable trellis optimization completely. +// Setting this to 2 will disable trellis optimization within the +// transform search. Trellis optimization will still be applied +// in the final encode. +#define DISABLE_TRELLISQ_SEARCH 0 + #define MAX_MESH_SPEED 5 // Max speed setting for mesh motion method static MESH_PATTERN good_quality_mesh_patterns[MAX_MESH_SPEED + 1][MAX_MESH_STEP] = { @@ -28,23 +34,21 @@ static MESH_PATTERN { { 64, 16 }, { 24, 8 }, { 12, 4 }, { 7, 1 } }, }; static unsigned char good_quality_max_mesh_pct[MAX_MESH_SPEED + 1] = { - 50, 25, 15, 5, 1, 1 + 50, 50, 25, 15, 5, 1 }; -#if CONFIG_INTRABC -// TODO(aconverse@google.com): These settings are pretty relaxed, tune them for +// TODO(huisu@google.com): These settings are pretty relaxed, tune them for // each speed setting static MESH_PATTERN intrabc_mesh_patterns[MAX_MESH_SPEED + 1][MAX_MESH_STEP] = { { { 256, 1 }, { 256, 1 }, { 0, 0 }, { 0, 0 } }, + { { 256, 1 }, { 256, 1 }, { 0, 0 }, { 0, 0 } }, { { 64, 1 }, { 64, 1 }, { 0, 0 }, { 0, 0 } }, { { 64, 1 }, { 64, 1 }, { 0, 0 }, { 0, 0 } }, { { 64, 4 }, { 16, 1 }, { 0, 0 }, { 0, 0 } }, { { 64, 4 }, { 16, 1 }, { 0, 0 }, { 0, 0 } }, - { { 64, 4 }, { 16, 1 }, { 0, 0 }, { 0, 0 } }, }; static uint8_t intrabc_max_mesh_pct[MAX_MESH_SPEED + 1] = { 100, 100, 100, 25, 25, 10 }; -#endif // Intra only frames, golden frames (except alt ref overlays) and // alt ref frames tend to be coded at a higher than ambient quality @@ -74,22 +78,18 @@ static BLOCK_SIZE set_partition_min_limit(AV1_COMMON *const cm) { } } +// Do we have an internal image edge (e.g. formatting bars). +static int has_internal_image_edge(const AV1_COMP *cpi) { + return (cpi->oxcf.pass == 2) && + ((cpi->twopass.this_frame_stats.inactive_zone_rows > 0) || + (cpi->twopass.this_frame_stats.inactive_zone_cols > 0)); +} + static void set_good_speed_feature_framesize_dependent(AV1_COMP *cpi, SPEED_FEATURES *sf, int speed) { AV1_COMMON *const cm = &cpi->common; - if (speed >= 1) { - if (AOMMIN(cm->width, cm->height) >= 720) { - sf->disable_split_mask = - cm->show_frame ? DISABLE_ALL_SPLIT : DISABLE_ALL_INTER_SPLIT; - sf->partition_search_breakout_dist_thr = (1 << 23); - } else { - sf->disable_split_mask = DISABLE_COMPOUND_SPLIT; - sf->partition_search_breakout_dist_thr = (1 << 21); - } - } - if (speed >= 2) { if (AOMMIN(cm->width, cm->height) >= 720) { sf->disable_split_mask = @@ -121,11 +121,11 @@ static void set_good_speed_feature_framesize_dependent(AV1_COMP *cpi, } // If this is a two pass clip that fits the criteria for animated or - // graphics content then reset disable_split_mask for speeds 1-4. + // graphics content then reset disable_split_mask for speeds 2+. // Also if the image edge is internal to the coded area. - if ((speed >= 1) && (cpi->oxcf.pass == 2) && + if ((speed >= 2) && (cpi->oxcf.pass == 2) && ((cpi->twopass.fr_content_type == FC_GRAPHICS_ANIMATION) || - (av1_internal_image_edge(cpi)))) { + (has_internal_image_edge(cpi)))) { sf->disable_split_mask = DISABLE_COMPOUND_SPLIT; } @@ -145,85 +145,83 @@ static void set_good_speed_features_framesize_independent(AV1_COMP *cpi, AV1_COMMON *const cm = &cpi->common; const int boosted = frame_is_boosted(cpi); + // Speed 0 for all speed features that give neutral coding performance change. + sf->reduce_inter_modes = 1; + sf->prune_ext_partition_types_search_level = 1; + sf->ml_prune_ab_partition = 1; + sf->adaptive_txb_search_level = 1; + sf->jnt_comp_skip_mv_search = 1; + sf->model_based_prune_tx_search_level = 1; + sf->model_based_post_interp_filter_breakout = 1; + sf->inter_mode_rd_model_estimation = 1; + if (speed >= 1) { - sf->tx_type_search.fast_intra_tx_type_search = 1; - sf->tx_type_search.fast_inter_tx_type_search = 1; + sf->gm_erroradv_type = GM_ERRORADV_TR_1; + sf->selective_ref_frame = 1; + sf->inter_tx_size_search_init_depth_rect = 1; + sf->inter_tx_size_search_init_depth_sqr = 1; + sf->intra_tx_size_search_init_depth_rect = 1; + sf->intra_tx_size_search_init_depth_sqr = 1; + sf->tx_size_search_lgr_block = 1; + sf->two_pass_partition_search = 1; + sf->mode_pruning_based_on_two_pass_partition_search = 1; + sf->prune_ext_partition_types_search_level = 2; + sf->use_fast_interpolation_filter_search = 1; + sf->skip_repeat_interpolation_filter_search = 1; + sf->tx_type_search.skip_tx_search = 1; + sf->tx_type_search.ml_tx_split_thresh = 40; + sf->model_based_prune_tx_search_level = 0; + sf->model_based_post_interp_filter_breakout = 0; + // TODO(angiebird): Re-evaluate the impact of inter_mode_rd_model_estimation + // on speed 1 + sf->inter_mode_rd_model_estimation = 0; + sf->adaptive_txb_search_level = 2; + sf->use_intra_txb_hash = 1; + sf->optimize_b_precheck = 1; + sf->dual_sgr_penalty_level = 1; } if (speed >= 2) { - if ((cpi->twopass.fr_content_type == FC_GRAPHICS_ANIMATION) || - av1_internal_image_edge(cpi)) { - sf->use_square_partition_only = !frame_is_boosted(cpi); - } else { - sf->use_square_partition_only = !frame_is_intra_only(cm); - } + sf->gm_erroradv_type = GM_ERRORADV_TR_2; - sf->less_rectangular_check = 1; + sf->selective_ref_frame = 2; + sf->fast_cdef_search = 1; sf->use_rd_breakout = 1; - sf->adaptive_motion_search = 1; - sf->mv.auto_mv_step_size = 1; sf->adaptive_rd_thresh = 1; + sf->mv.auto_mv_step_size = 1; sf->mv.subpel_iters_per_step = 1; - sf->mode_skip_start = 10; - sf->adaptive_pred_interp_filter = 1; - - sf->recode_loop = ALLOW_RECODE_KFARFGF; -#if CONFIG_TX64X64 - sf->intra_y_mode_mask[TX_64X64] = INTRA_DC_H_V; -#if CONFIG_CFL - sf->intra_uv_mode_mask[TX_64X64] = UV_INTRA_DC_H_V_CFL; -#else - sf->intra_uv_mode_mask[TX_64X64] = INTRA_DC_H_V; -#endif // CONFIG_CFL -#endif // CONFIG_TX64X64 - sf->intra_y_mode_mask[TX_32X32] = INTRA_DC_H_V; -#if CONFIG_CFL - sf->intra_uv_mode_mask[TX_32X32] = UV_INTRA_DC_H_V_CFL; -#else - sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC_H_V; -#endif - sf->intra_y_mode_mask[TX_16X16] = INTRA_DC_H_V; -#if CONFIG_CFL - sf->intra_uv_mode_mask[TX_16X16] = UV_INTRA_DC_H_V_CFL; -#else - sf->intra_uv_mode_mask[TX_16X16] = INTRA_DC_H_V; -#endif + sf->disable_filter_search_var_thresh = 100; + sf->comp_inter_joint_search_thresh = BLOCK_SIZES_ALL; - sf->tx_size_search_breakout = 1; sf->partition_search_breakout_rate_thr = 80; - sf->tx_type_search.prune_mode = PRUNE_ONE; - // Use transform domain distortion. - // Note var-tx expt always uses pixel domain distortion. - sf->use_transform_domain_distortion = 1; + sf->auto_min_max_partition_size = RELAXED_NEIGHBORING_MIN_MAX; + sf->allow_partition_search_skip = 1; sf->disable_wedge_search_var_thresh = 100; sf->fast_wedge_sign_estimate = 1; } if (speed >= 3) { - sf->tx_size_search_method = - frame_is_boosted(cpi) ? USE_FULL_RD : USE_LARGESTALL; - sf->mode_search_skip_flags = - (cm->frame_type == KEY_FRAME) - ? 0 - : FLAG_SKIP_INTRA_DIRMISMATCH | FLAG_SKIP_INTRA_BESTINTER | - FLAG_SKIP_COMP_BESTINTRA | FLAG_SKIP_INTRA_LOWVAR; - sf->disable_filter_search_var_thresh = 100; - sf->comp_inter_joint_search_thresh = BLOCK_SIZES_ALL; - sf->auto_min_max_partition_size = RELAXED_NEIGHBORING_MIN_MAX; - sf->allow_partition_search_skip = 1; - sf->use_upsampled_references = 0; + sf->tx_size_search_method = boosted ? USE_FULL_RD : USE_LARGESTALL; + sf->less_rectangular_check = 1; + sf->mode_skip_start = 10; + sf->adaptive_pred_interp_filter = 1; + // adaptive_motion_search breaks encoder multi-thread tests. + // The values in x->pred_mv[] differ for single and multi-thread cases. + // See aomedia:1778. + // sf->adaptive_motion_search = 1; + sf->recode_loop = ALLOW_RECODE_KFARFGF; + sf->use_transform_domain_distortion = 1; + sf->use_accurate_subpel_search = 0; sf->adaptive_rd_thresh = 2; -#if CONFIG_EXT_TX - sf->tx_type_search.prune_mode = PRUNE_TWO; -#endif -#if CONFIG_GLOBAL_MOTION + sf->tx_type_search.prune_mode = PRUNE_2D_FAST; sf->gm_search_type = GM_DISABLE_SEARCH; -#endif // CONFIG_GLOBAL_MOTION } if (speed >= 4) { - sf->use_square_partition_only = !frame_is_intra_only(cm); + sf->tx_type_search.fast_intra_tx_type_search = 1; + sf->tx_type_search.fast_inter_tx_type_search = 1; + sf->use_square_partition_only = !boosted; sf->tx_size_search_method = frame_is_intra_only(cm) ? USE_FULL_RD : USE_LARGESTALL; sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED; @@ -232,52 +230,44 @@ static void set_good_speed_features_framesize_independent(AV1_COMP *cpi, sf->cb_partition_search = !boosted; sf->cb_pred_filter_search = 1; sf->alt_ref_search_fp = 1; - sf->recode_loop = ALLOW_RECODE_KFMAXBW; - sf->adaptive_rd_thresh = 3; sf->mode_skip_start = 6; -#if CONFIG_TX64X64 - sf->intra_y_mode_mask[TX_64X64] = INTRA_DC; -#if CONFIG_CFL - sf->intra_uv_mode_mask[TX_64X64] = UV_INTRA_DC_CFL; -#else - sf->intra_uv_mode_mask[TX_64X64] = INTRA_DC; -#endif // CONFIG_CFL -#endif // CONFIG_TX64X64 - sf->intra_y_mode_mask[TX_32X32] = INTRA_DC; -#if CONFIG_CFL - sf->intra_uv_mode_mask[TX_32X32] = UV_INTRA_DC_CFL; -#else - sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC; -#endif // CONFIG_CFL sf->adaptive_interp_filter_search = 1; } if (speed >= 5) { + sf->recode_loop = ALLOW_RECODE_KFMAXBW; + sf->intra_y_mode_mask[TX_64X64] = INTRA_DC_H_V; + sf->intra_uv_mode_mask[TX_64X64] = UV_INTRA_DC_H_V_CFL; + sf->intra_y_mode_mask[TX_32X32] = INTRA_DC_H_V; + sf->intra_uv_mode_mask[TX_32X32] = UV_INTRA_DC_H_V_CFL; + sf->intra_y_mode_mask[TX_16X16] = INTRA_DC_H_V; + sf->intra_uv_mode_mask[TX_16X16] = UV_INTRA_DC_H_V_CFL; sf->use_square_partition_only = 1; sf->tx_size_search_method = USE_LARGESTALL; sf->mv.search_method = BIGDIA; sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED_MORE; sf->adaptive_rd_thresh = 4; - if (cm->frame_type != KEY_FRAME) - sf->mode_search_skip_flags |= FLAG_EARLY_TERMINATE; + sf->mode_search_skip_flags = + (cm->frame_type == KEY_FRAME) + ? 0 + : FLAG_SKIP_INTRA_DIRMISMATCH | FLAG_SKIP_INTRA_BESTINTER | + FLAG_SKIP_COMP_BESTINTRA | FLAG_SKIP_INTRA_LOWVAR | + FLAG_EARLY_TERMINATE; sf->disable_filter_search_var_thresh = 200; sf->use_fast_coef_updates = ONE_LOOP_REDUCED; sf->use_fast_coef_costing = 1; sf->partition_search_breakout_rate_thr = 300; + sf->use_transform_domain_distortion = 2; } if (speed >= 6) { int i; - sf->optimize_coefficients = 0; + sf->optimize_coefficients = NO_TRELLIS_OPT; 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; -#if CONFIG_CFL sf->intra_uv_mode_mask[i] = UV_INTRA_DC_CFL; -#else - sf->intra_uv_mode_mask[i] = INTRA_DC; -#endif // CONFIG_CFL } sf->partition_search_breakout_rate_thr = 500; sf->mv.reduce_first_step_size = 1; @@ -288,9 +278,7 @@ static void set_good_speed_features_framesize_independent(AV1_COMP *cpi, const int frames_since_key = is_keyframe ? 0 : cpi->rc.frames_since_key; sf->default_max_partition_size = BLOCK_32X32; sf->default_min_partition_size = BLOCK_8X8; -#if CONFIG_TX64X64 sf->intra_y_mode_mask[TX_64X64] = INTRA_DC; -#endif // CONFIG_TX64X64 sf->intra_y_mode_mask[TX_32X32] = INTRA_DC; sf->frame_parameter_update = 0; sf->mv.search_method = FAST_HEX; @@ -298,13 +286,10 @@ static void set_good_speed_features_framesize_independent(AV1_COMP *cpi, sf->inter_mode_mask[BLOCK_32X64] = INTER_NEAREST; sf->inter_mode_mask[BLOCK_64X32] = INTER_NEAREST; sf->inter_mode_mask[BLOCK_64X64] = INTER_NEAREST; -#if CONFIG_EXT_PARTITION sf->inter_mode_mask[BLOCK_64X128] = INTER_NEAREST; sf->inter_mode_mask[BLOCK_128X64] = INTER_NEAREST; sf->inter_mode_mask[BLOCK_128X128] = INTER_NEAREST; -#endif // CONFIG_EXT_PARTITION sf->partition_search_type = REFERENCE_PARTITION; - sf->default_min_partition_size = BLOCK_8X8; sf->reuse_inter_pred_sby = 1; sf->force_frame_boost = is_keyframe || @@ -324,31 +309,9 @@ static void set_good_speed_features_framesize_independent(AV1_COMP *cpi, void av1_set_speed_features_framesize_dependent(AV1_COMP *cpi) { SPEED_FEATURES *const sf = &cpi->sf; const AV1EncoderConfig *const oxcf = &cpi->oxcf; - AV1_COMMON *const cm = &cpi->common; RD_OPT *const rd = &cpi->rd; int i; -// Limit memory usage for high resolutions -#if CONFIG_EXT_REFS - // TODO(zoeliu): Temporary solution to resolve the insufficient RAM issue for - // ext-refs. Need to work with @yunqingwang to have a more - // effective solution. - if (AOMMIN(cm->width, cm->height) > 720) { - // Turn off the use of upsampled references for HD resolution - sf->use_upsampled_references = 0; - } else if ((AOMMIN(cm->width, cm->height) > 540) && - (oxcf->profile != PROFILE_0)) { - sf->use_upsampled_references = 0; - } -#else - if (AOMMIN(cm->width, cm->height) > 1080) { - sf->use_upsampled_references = 0; - } else if ((AOMMIN(cm->width, cm->height) > 720) && - (oxcf->profile != PROFILE_0)) { - sf->use_upsampled_references = 0; - } -#endif // CONFIG_EXT_REFS - if (oxcf->mode == GOOD) { set_good_speed_feature_framesize_dependent(cpi, sf, oxcf->speed); } @@ -371,6 +334,52 @@ void av1_set_speed_features_framesize_dependent(AV1_COMP *cpi) { cpi->find_fractional_mv_step = av1_return_min_sub_pixel_mv; } +static void set_dev_sf(AV1_COMP *cpi, SPEED_FEATURES *sf, int speed) { + AV1_COMMON *const cm = &cpi->common; + + if (speed & TXFM_CODING_SF) { + sf->inter_tx_size_search_init_depth_rect = 1; + sf->inter_tx_size_search_init_depth_sqr = 1; + sf->intra_tx_size_search_init_depth_rect = 1; + sf->intra_tx_size_search_init_depth_sqr = 1; + sf->tx_size_search_method = USE_FAST_RD; + sf->tx_type_search.fast_intra_tx_type_search = 1; + sf->tx_type_search.fast_inter_tx_type_search = 1; + } + + if (speed & INTER_PRED_SF) { + sf->selective_ref_frame = 2; + // sf->adaptive_motion_search = 1; + sf->mv.auto_mv_step_size = 1; + sf->adaptive_rd_thresh = 1; + sf->mv.subpel_iters_per_step = 1; + sf->adaptive_pred_interp_filter = 1; + } + + if (speed & INTRA_PRED_SF) { + sf->max_intra_bsize = BLOCK_32X32; + } + + if (speed & PARTITION_SF) { + if ((cpi->twopass.fr_content_type == FC_GRAPHICS_ANIMATION) || + has_internal_image_edge(cpi)) { + sf->use_square_partition_only = !frame_is_boosted(cpi); + } else { + sf->use_square_partition_only = !frame_is_intra_only(cm); + } + sf->less_rectangular_check = 1; + sf->prune_ext_partition_types_search_level = 2; + } + + if (speed & LOOP_FILTER_SF) { + sf->fast_cdef_search = 1; + } + + if (speed & RD_SKIP_SF) { + sf->use_rd_breakout = 1; + } +} + void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) { AV1_COMMON *const cm = &cpi->common; SPEED_FEATURES *const sf = &cpi->sf; @@ -378,7 +387,6 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) { const AV1EncoderConfig *const oxcf = &cpi->oxcf; int i; - (void)cm; // best quality defaults sf->frame_parameter_update = 1; sf->mv.search_method = NSTEP; @@ -386,7 +394,19 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) { 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); +#if DISABLE_TRELLISQ_SEARCH == 2 + sf->optimize_coefficients = !is_lossless_requested(&cpi->oxcf) + ? FINAL_PASS_TRELLIS_OPT + : NO_TRELLIS_OPT; +#elif DISABLE_TRELLISQ_SEARCH == 1 + sf->optimize_coefficients = NO_TRELLIS_OPT; +#else + if (is_lossless_requested(&cpi->oxcf)) + sf->optimize_coefficients = NO_TRELLIS_OPT; + else + sf->optimize_coefficients = FULL_TRELLIS_OPT; +#endif // DISABLE_TRELLISQ_SEARCH + sf->gm_erroradv_type = GM_ERRORADV_TR_0; sf->mv.reduce_first_step_size = 0; sf->coeff_prob_appx_step = 1; sf->mv.auto_mv_step_size = 0; @@ -394,6 +414,15 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) { sf->comp_inter_joint_search_thresh = BLOCK_4X4; sf->adaptive_rd_thresh = 0; sf->tx_size_search_method = USE_FULL_RD; + sf->inter_tx_size_search_init_depth_sqr = 0; + sf->inter_tx_size_search_init_depth_rect = 0; + sf->intra_tx_size_search_init_depth_rect = 0; + sf->intra_tx_size_search_init_depth_sqr = 0; + sf->tx_size_search_lgr_block = 0; + sf->model_based_prune_tx_search_level = 0; + sf->model_based_post_interp_filter_breakout = 0; + sf->reduce_inter_modes = 0; + sf->selective_ref_gm = 1; sf->adaptive_motion_search = 0; sf->adaptive_pred_interp_filter = 0; sf->adaptive_mode_search = 0; @@ -401,10 +430,13 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) { sf->cb_partition_search = 0; sf->alt_ref_search_fp = 0; sf->partition_search_type = SEARCH_PARTITION; - sf->tx_type_search.prune_mode = NO_PRUNE; + sf->tx_type_search.prune_mode = PRUNE_2D_ACCURATE; + sf->tx_type_search.ml_tx_split_thresh = 30; sf->tx_type_search.use_skip_flag_prediction = 1; sf->tx_type_search.fast_intra_tx_type_search = 0; sf->tx_type_search.fast_inter_tx_type_search = 0; + sf->tx_type_search.skip_tx_search = 0; + sf->selective_ref_frame = 0; sf->less_rectangular_check = 0; sf->use_square_partition_only = 0; sf->auto_min_max_partition_size = NOT_IN_USE; @@ -420,17 +452,25 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) { sf->disable_filter_search_var_thresh = 0; sf->adaptive_interp_filter_search = 0; sf->allow_partition_search_skip = 0; - sf->use_upsampled_references = 1; + sf->use_accurate_subpel_search = 1; sf->disable_wedge_search_var_thresh = 0; sf->fast_wedge_sign_estimate = 0; + sf->drop_ref = 0; + sf->skip_intra_in_interframe = 1; + sf->txb_split_cap = 1; + sf->adaptive_txb_search_level = 0; + sf->two_pass_partition_search = 0; + sf->mode_pruning_based_on_two_pass_partition_search = 0; + sf->use_intra_txb_hash = 0; + sf->use_inter_txb_hash = 1; + sf->use_mb_rd_hash = 1; + sf->optimize_b_precheck = 0; + sf->jnt_comp_fast_tx_search = 0; + sf->jnt_comp_skip_mv_search = 0; for (i = 0; i < TX_SIZES; i++) { sf->intra_y_mode_mask[i] = INTRA_ALL; -#if CONFIG_CFL sf->intra_uv_mode_mask[i] = UV_INTRA_ALL; -#else - sf->intra_uv_mode_mask[i] = INTRA_ALL; -#endif // CONFIG_CFL } sf->use_rd_breakout = 0; sf->lpf_pick = LPF_PICK_FROM_FULL_IMAGE; @@ -448,22 +488,28 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) { // Recode loop tolerance %. sf->recode_tolerance = 25; sf->default_interp_filter = SWITCHABLE; - sf->tx_size_search_breakout = 0; sf->partition_search_breakout_dist_thr = 0; sf->partition_search_breakout_rate_thr = 0; sf->simple_model_rd_from_var = 0; + sf->prune_ext_partition_types_search_level = 0; + sf->ml_prune_ab_partition = 0; + sf->fast_cdef_search = 0; // Set this at the appropriate speed levels sf->use_transform_domain_distortion = 0; -#if CONFIG_GLOBAL_MOTION sf->gm_search_type = GM_FULL_SEARCH; -#endif // CONFIG_GLOBAL_MOTION + sf->use_fast_interpolation_filter_search = 0; + sf->skip_repeat_interpolation_filter_search = 0; + sf->use_hash_based_trellis = 0; + + // Set decoder side speed feature to use less dual sgr modes + sf->dual_sgr_penalty_level = 0; + + sf->inter_mode_rd_model_estimation = 0; - if (oxcf->mode == GOOD -#if CONFIG_XIPHRC - || oxcf->pass == 1 -#endif - ) + set_dev_sf(cpi, sf, oxcf->dev_sf); + + if (oxcf->mode == GOOD) set_good_speed_features_framesize_independent(cpi, sf, oxcf->speed); // sf->partition_search_breakout_dist_thr is set assuming max 64x64 @@ -472,7 +518,6 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) { sf->partition_search_breakout_dist_thr <<= 2 * (MAX_SB_SIZE_LOG2 - 6); } - cpi->full_search_sad = av1_full_search_sad; cpi->diamond_search_sad = av1_diamond_search_sad; sf->allow_exhaustive_searches = 1; @@ -490,7 +535,6 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) { sf->mesh_patterns[i].interval = good_quality_mesh_patterns[speed][i].interval; } -#if CONFIG_INTRABC if ((frame_is_intra_only(cm) && cm->allow_screen_content_tools) && (cpi->twopass.fr_content_type == FC_GRAPHICS_ANIMATION || cpi->oxcf.content == AOM_CONTENT_SCREEN)) { @@ -500,18 +544,15 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) { } sf->max_exaustive_pct = intrabc_max_mesh_pct[speed]; } -#endif // CONFIG_INTRABC -#if !CONFIG_XIPHRC // Slow quant, dct and trellis not worthwhile for first pass // so make sure they are always turned off. - if (oxcf->pass == 1) sf->optimize_coefficients = 0; -#endif + if (oxcf->pass == 1) sf->optimize_coefficients = NO_TRELLIS_OPT; // No recode for 1 pass. if (oxcf->pass == 0) { sf->recode_loop = DISALLOW_RECODE; - sf->optimize_coefficients = 0; + sf->optimize_coefficients = NO_TRELLIS_OPT; } if (sf->mv.subpel_search_method == SUBPEL_TREE) { @@ -524,12 +565,11 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) { cpi->find_fractional_mv_step = av1_find_best_sub_pixel_tree_pruned_evenmore; } -#if !CONFIG_AOM_QM - x->optimize = sf->optimize_coefficients == 1 && oxcf->pass != 1; -#else + cpi->optimize_speed_feature = + oxcf->pass != 1 ? sf->optimize_coefficients : NO_TRELLIS_OPT; // FIXME: trellis not very efficient for quantisation matrices - x->optimize = 0; -#endif + if (cm->using_qmatrix) cpi->optimize_speed_feature = NO_TRELLIS_OPT; + if (oxcf->disable_trellis_quant) cpi->optimize_speed_feature = NO_TRELLIS_OPT; x->min_partition_size = sf->default_min_partition_size; x->max_partition_size = sf->default_max_partition_size; @@ -543,4 +583,8 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) { cpi->find_fractional_mv_step = av1_return_max_sub_pixel_mv; else if (cpi->oxcf.motion_vector_unit_test == 2) cpi->find_fractional_mv_step = av1_return_min_sub_pixel_mv; + +#if CONFIG_DIST_8X8 + if (sf->use_transform_domain_distortion > 0) cpi->oxcf.using_dist_8x8 = 0; +#endif // CONFIG_DIST_8X8 } |