Commit 722e9d61 authored by Alex Converse's avatar Alex Converse
Browse files

Drop special inter mode selection for screen content.

Better mode selection was implemented for all content.

Change-Id: I479778ed21d3968892f4dce396c83733583f4f23
parent 72522dbc
...@@ -204,6 +204,7 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, ...@@ -204,6 +204,7 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
const int is_keyframe = cm->frame_type == KEY_FRAME; const int is_keyframe = cm->frame_type == KEY_FRAME;
const int frames_since_key = is_keyframe ? 0 : cpi->rc.frames_since_key; const int frames_since_key = is_keyframe ? 0 : cpi->rc.frames_since_key;
(void) content;
sf->static_segmentation = 0; sf->static_segmentation = 0;
sf->adaptive_rd_thresh = 1; sf->adaptive_rd_thresh = 1;
sf->use_fast_coef_costing = 1; sf->use_fast_coef_costing = 1;
...@@ -307,13 +308,6 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, ...@@ -307,13 +308,6 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
} }
if (speed >= 6) { if (speed >= 6) {
if (content == VP9E_CONTENT_SCREEN) {
int i;
// Allow fancy modes at all sizes since SOURCE_VAR_BASED_PARTITION is used
for (i = 0; i < BLOCK_SIZES; ++i)
sf->inter_mode_mask[i] = INTER_NEAREST_NEAR_NEW;
}
// Adaptively switch between SOURCE_VAR_BASED_PARTITION and FIXED_PARTITION. // Adaptively switch between SOURCE_VAR_BASED_PARTITION and FIXED_PARTITION.
sf->partition_search_type = VAR_BASED_PARTITION; sf->partition_search_type = VAR_BASED_PARTITION;
sf->search_type_check_frequency = 50; sf->search_type_check_frequency = 50;
......
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