ref: 849b3c238d3bc3a1d038d15413b7c96694285ffe
parent: c66eeab30e426c41ed22adc22d3497e22e90f37f
parent: 44473e7eb9cd8a83fba8f68604e371b03237423d
author: Paul Wilkins <paulwilkins@google.com>
date: Fri Nov 17 05:34:56 EST 2017
Merge "Disable allow_partition_search_skip for speed 2."
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -245,7 +245,6 @@
sf->disable_filter_search_var_thresh = 100;
sf->comp_inter_joint_search_thresh = BLOCK_SIZES;
sf->auto_min_max_partition_size = RELAXED_NEIGHBORING_MIN_MAX;
- sf->allow_partition_search_skip = 1;
sf->recode_tolerance_low = 15;
sf->recode_tolerance_high = 45;
@@ -276,6 +275,7 @@
sf->intra_y_mode_mask[TX_32X32] = INTRA_DC;
sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC;
sf->adaptive_interp_filter_search = 1;
+ sf->allow_partition_search_skip = 1;
if (cpi->twopass.fr_content_type == FC_GRAPHICS_ANIMATION) {
for (i = 0; i < MAX_MESH_STEP; ++i) {