summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_speed_features.c
diff options
context:
space:
mode:
authorYunqing Wang <yunqingwang@google.com>2014-04-09 10:26:42 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-04-09 10:26:42 -0700
commit2e7d3277892d27a7598ea5b27251b0346e84ee19 (patch)
tree56630ed77ed247197877e8a708f3681d988bf04a /vp9/encoder/vp9_speed_features.c
parenta30ff3458dc2b7017ed9a5f1ce9132564ccc15dd (diff)
parent4e66293fcb5b4779490faf8f40300e7e0096640e (diff)
downloadlibvpx-2e7d3277892d27a7598ea5b27251b0346e84ee19.tar
libvpx-2e7d3277892d27a7598ea5b27251b0346e84ee19.tar.gz
libvpx-2e7d3277892d27a7598ea5b27251b0346e84ee19.tar.bz2
libvpx-2e7d3277892d27a7598ea5b27251b0346e84ee19.zip
Merge "Use source frame difference to make partition decision"
Diffstat (limited to 'vp9/encoder/vp9_speed_features.c')
-rw-r--r--vp9/encoder/vp9_speed_features.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index c72b62bc5..d6b6174fa 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -265,7 +265,11 @@ static void set_rt_speed_feature(VP9_COMMON *cm, SPEED_FEATURES *sf,
}
if (speed >= 6) {
- sf->partition_search_type = VAR_BASED_FIXED_PARTITION;
+ // Adaptively switch between SOURCE_VAR_BASED_PARTITION and FIXED_PARTITION.
+ sf->partition_search_type = SOURCE_VAR_BASED_PARTITION;
+ sf->search_type_check_frequency = 50;
+ sf->source_var_thresh = 360;
+
sf->use_nonrd_pick_mode = 1;
sf->search_method = FAST_DIAMOND;
}
@@ -338,6 +342,8 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
// This setting only takes effect when partition_search_type is set
// to FIXED_PARTITION.
sf->always_this_block_size = BLOCK_16X16;
+ sf->search_type_check_frequency = 50;
+ sf->source_var_thresh = 100;
// Recode loop tolerence %.
sf->recode_tolerance = 25;