Commit af6d2c7d authored by Alex Converse's avatar Alex Converse
Browse files

Turn off simple_model_rd_from_var at speed 4.

This got erroneously changed during the refactor. This fixes
SvcTest.TwoPassEncode2TemporalLayersWithMultipleFrameContextsAndTiles.

Change-Id: Ifa5ab0e098396c5e2d10478db87df256eadfa4c7
parent c827c59e
...@@ -193,7 +193,6 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm, ...@@ -193,7 +193,6 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm,
sf->use_fast_coef_costing = 1; sf->use_fast_coef_costing = 1;
sf->motion_field_mode_search = !boosted; sf->motion_field_mode_search = !boosted;
sf->partition_search_breakout_rate_thr = 300; sf->partition_search_breakout_rate_thr = 300;
sf->simple_model_rd_from_var = 1;
} }
if (speed >= 5) { if (speed >= 5) {
...@@ -207,6 +206,7 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm, ...@@ -207,6 +206,7 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm,
} }
sf->partition_search_breakout_rate_thr = 500; sf->partition_search_breakout_rate_thr = 500;
sf->mv.reduce_first_step_size = 1; sf->mv.reduce_first_step_size = 1;
sf->simple_model_rd_from_var = 1;
} }
} }
...@@ -336,7 +336,6 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, ...@@ -336,7 +336,6 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
sf->inter_mode_mask[BLOCK_64X64] = INTER_NEAREST; sf->inter_mode_mask[BLOCK_64X64] = INTER_NEAREST;
sf->max_intra_bsize = BLOCK_32X32; sf->max_intra_bsize = BLOCK_32X32;
sf->allow_skip_recode = 1; sf->allow_skip_recode = 1;
sf->simple_model_rd_from_var = 1;
} }
if (speed >= 5) { if (speed >= 5) {
...@@ -363,6 +362,7 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, ...@@ -363,6 +362,7 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
sf->use_fast_coef_updates = is_keyframe ? TWO_LOOP : ONE_LOOP_REDUCED; sf->use_fast_coef_updates = is_keyframe ? TWO_LOOP : ONE_LOOP_REDUCED;
sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH; sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH;
sf->tx_size_search_method = is_keyframe ? USE_LARGESTALL : USE_TX_8X8; sf->tx_size_search_method = is_keyframe ? USE_LARGESTALL : USE_TX_8X8;
sf->simple_model_rd_from_var = 1;
if (!is_keyframe) { if (!is_keyframe) {
int i; int i;
......
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