Merge "Fix speed 7 and speed 12 for rt"

This commit is contained in:
Yaowu Xu 2014-11-03 08:02:58 -08:00 committed by Gerrit Code Review
commit 2fe893c94f

View File

@ -295,16 +295,16 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
} }
if (speed >= 7) { if (speed >= 7) {
sf->adaptive_rd_thresh = 3;
sf->mv.search_method = FAST_DIAMOND; sf->mv.search_method = FAST_DIAMOND;
sf->mv.fullpel_search_step_param = 10; sf->mv.fullpel_search_step_param = 10;
sf->lpf_pick = LPF_PICK_MINIMAL_LPF; sf->lpf_pick = LPF_PICK_MINIMAL_LPF;
sf->encode_breakout_thresh = (MIN(cm->width, cm->height) >= 720) ? sf->encode_breakout_thresh = (MIN(cm->width, cm->height) >= 720) ?
800 : 300; 800 : 300;
sf->elevate_newmv_thresh = 2500;
} }
if (speed >= 12) { if (speed >= 12) {
sf->elevate_newmv_thresh = 4000; sf->adaptive_rd_thresh = 4;
sf->mv.subpel_force_stop = 2; sf->mv.subpel_force_stop = 2;
} }
@ -386,7 +386,7 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
sf->search_type_check_frequency = 50; sf->search_type_check_frequency = 50;
sf->encode_breakout_thresh = 0; sf->encode_breakout_thresh = 0;
sf->elevate_newmv_thresh = 0; sf->elevate_newmv_thresh = 0;
// Recode loop tolerence %. // Recode loop tolerance %.
sf->recode_tolerance = 25; sf->recode_tolerance = 25;
sf->default_interp_filter = SWITCHABLE; sf->default_interp_filter = SWITCHABLE;
sf->tx_size_search_breakout = 0; sf->tx_size_search_breakout = 0;