ref: 2fe893c94fc5880f799d8749bb99b1aa7db79619
parent: 55577431ae364273dbaf2aa1e74f51b0cb893464
parent: 0271ff7775c78c51a2ea68c9eb129bbad9651dca
author: Yaowu Xu <[email protected]>
date: Mon Nov 3 03:02:58 EST 2014
Merge "Fix speed 7 and speed 12 for rt"
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -295,16 +295,16 @@
}
if (speed >= 7) {
+ sf->adaptive_rd_thresh = 3;
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) ?
800 : 300;
- sf->elevate_newmv_thresh = 2500;
}
if (speed >= 12) {
- sf->elevate_newmv_thresh = 4000;
+ sf->adaptive_rd_thresh = 4;
sf->mv.subpel_force_stop = 2;
}
@@ -386,7 +386,7 @@
sf->search_type_check_frequency = 50;
sf->encode_breakout_thresh = 0;
sf->elevate_newmv_thresh = 0;
- // Recode loop tolerence %.
+ // Recode loop tolerance %.
sf->recode_tolerance = 25;
sf->default_interp_filter = SWITCHABLE;
sf->tx_size_search_breakout = 0;