Merge "Disable allow_partition_search_skip for speed 2."
This commit is contained in:
@@ -245,7 +245,6 @@ static void set_good_speed_feature_framesize_independent(VP9_COMP *cpi,
|
|||||||
sf->disable_filter_search_var_thresh = 100;
|
sf->disable_filter_search_var_thresh = 100;
|
||||||
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->allow_partition_search_skip = 1;
|
|
||||||
sf->recode_tolerance_low = 15;
|
sf->recode_tolerance_low = 15;
|
||||||
sf->recode_tolerance_high = 45;
|
sf->recode_tolerance_high = 45;
|
||||||
|
|
||||||
@@ -276,6 +275,7 @@ static void set_good_speed_feature_framesize_independent(VP9_COMP *cpi,
|
|||||||
sf->intra_y_mode_mask[TX_32X32] = INTRA_DC;
|
sf->intra_y_mode_mask[TX_32X32] = INTRA_DC;
|
||||||
sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC;
|
sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC;
|
||||||
sf->adaptive_interp_filter_search = 1;
|
sf->adaptive_interp_filter_search = 1;
|
||||||
|
sf->allow_partition_search_skip = 1;
|
||||||
|
|
||||||
if (cpi->twopass.fr_content_type == FC_GRAPHICS_ANIMATION) {
|
if (cpi->twopass.fr_content_type == FC_GRAPHICS_ANIMATION) {
|
||||||
for (i = 0; i < MAX_MESH_STEP; ++i) {
|
for (i = 0; i < MAX_MESH_STEP; ++i) {
|
||||||
|
|||||||
Reference in New Issue
Block a user