Commit a6aaab3a authored by Alex Converse's avatar Alex Converse Committed by Gerrit Code Review

Merge "Use INTER_ALL for VAR based partitions for screencast material."

parents b26d9eab 2be9ea61
...@@ -160,7 +160,7 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm, ...@@ -160,7 +160,7 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm,
} }
static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
int speed) { int speed, vp9e_tune_content content) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
const int frames_since_key = const int frames_since_key =
cm->frame_type == KEY_FRAME ? 0 : cpi->rc.frames_since_key; cm->frame_type == KEY_FRAME ? 0 : cpi->rc.frames_since_key;
...@@ -275,6 +275,13 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, ...@@ -275,6 +275,13 @@ 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_ALL;
}
// Adaptively switch between SOURCE_VAR_BASED_PARTITION and FIXED_PARTITION. // Adaptively switch between SOURCE_VAR_BASED_PARTITION and FIXED_PARTITION.
sf->partition_search_type = SOURCE_VAR_BASED_PARTITION; sf->partition_search_type = SOURCE_VAR_BASED_PARTITION;
sf->search_type_check_frequency = 50; sf->search_type_check_frequency = 50;
...@@ -392,7 +399,7 @@ void vp9_set_speed_features(VP9_COMP *cpi) { ...@@ -392,7 +399,7 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
set_good_speed_feature(cpi, cm, sf, oxcf->speed); set_good_speed_feature(cpi, cm, sf, oxcf->speed);
break; break;
case REALTIME: case REALTIME:
set_rt_speed_feature(cpi, sf, oxcf->speed); set_rt_speed_feature(cpi, sf, oxcf->speed, oxcf->content);
break; break;
} }
......
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