summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_speed_features.c
diff options
context:
space:
mode:
authorYunqing Wang <yunqingwang@google.com>2014-07-09 13:46:42 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-07-09 13:46:42 -0700
commita51e389b426d69f920dad77f4a30a6ff5187306c (patch)
tree7ad1aafbbff64b6d6f910de2e6921b02bea28e95 /vp9/encoder/vp9_speed_features.c
parent0e99f3a3873594d56e875f1181d5b3b86ed551c7 (diff)
parent9bd3be69a447766780e6164ad69eda8b7d0a266f (diff)
downloadlibvpx-a51e389b426d69f920dad77f4a30a6ff5187306c.tar
libvpx-a51e389b426d69f920dad77f4a30a6ff5187306c.tar.gz
libvpx-a51e389b426d69f920dad77f4a30a6ff5187306c.tar.bz2
libvpx-a51e389b426d69f920dad77f4a30a6ff5187306c.zip
Merge "Adjust full-pixel search method in real-time mode"
Diffstat (limited to 'vp9/encoder/vp9_speed_features.c')
-rw-r--r--vp9/encoder/vp9_speed_features.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index 00f4d7da6..f6241c38d 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -266,7 +266,6 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
sf->max_delta_qindex = (cm->frame_type == KEY_FRAME) ? 20 : 15;
sf->partition_search_type = REFERENCE_PARTITION;
sf->use_nonrd_pick_mode = 1;
- sf->mv.search_method = FAST_DIAMOND;
sf->allow_skip_recode = 0;
}
@@ -288,6 +287,7 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
sf->mv.reduce_first_step_size = 1;
}
if (speed >= 7) {
+ sf->mv.search_method = FAST_DIAMOND;
sf->mv.fullpel_search_step_param = 10;
sf->lpf_pick = LPF_PICK_MINIMAL_LPF;
sf->encode_breakout_thresh = (MIN(cm->width, cm->height) >= 720) ?