generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nextgen branch cleanup: remove elevate_newmv_thresh feature

Browse Source 
Code cleanup.

Change-Id: Idf00d5359e5f3d943ee39b4a00f8d40325c0f8b3
This commit is contained in:
Yunqing Wang 2015-07-14 14:28:56 -07:00
parent 527f88316c
commit 7959dd012c
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vp9/encoder/vp9_rd.c
View File

@ -642,13 +642,6 @@ void vp9_set_rd_speed_thresholds(VP9_COMP *cpi) {
rd->thresh_mult[THR_NEW2G] += 1000; rd->thresh_mult[THR_NEW2G] += 1000;
#endif // CONFIG_NEW_INTER #endif // CONFIG_NEW_INTER
// Adjust threshold only in real time mode, which only uses last
// reference frame.
rd->thresh_mult[THR_NEWMV] += sf->elevate_newmv_thresh;
#if CONFIG_NEW_INTER
rd->thresh_mult[THR_NEW2MV] += sf->elevate_newmv_thresh;
#endif // CONFIG_NEW_INTER
rd->thresh_mult[THR_NEARMV] += 1000; rd->thresh_mult[THR_NEARMV] += 1000;
rd->thresh_mult[THR_NEARA] += 1000; rd->thresh_mult[THR_NEARA] += 1000;

6
vp9/encoder/vp9_speed_features.c
View File

@ -290,9 +290,6 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, int speed) {
sf->tx_size_search_method = is_keyframe ? USE_LARGESTALL : USE_TX_8X8; sf->tx_size_search_method = is_keyframe ? USE_LARGESTALL : USE_TX_8X8;
// Increase mode checking threshold for NEWMV.
sf->elevate_newmv_thresh = 1000;
sf->mv.reduce_first_step_size = 1; sf->mv.reduce_first_step_size = 1;
} }
@ -302,11 +299,9 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, int speed) {
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->mv.subpel_force_stop = 2; sf->mv.subpel_force_stop = 2;
} }
} }
@ -376,7 +371,6 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
sf->always_this_block_size = BLOCK_16X16; sf->always_this_block_size = BLOCK_16X16;
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;
// Recode loop tolerence %. // Recode loop tolerence %.
sf->recode_tolerance = 25; sf->recode_tolerance = 25;
sf->default_interp_filter = SWITCHABLE; sf->default_interp_filter = SWITCHABLE;

3
vp9/encoder/vp9_speed_features.h
View File

@ -423,9 +423,6 @@ typedef struct SPEED_FEATURES {
// enabled in real time mode. // enabled in real time mode.
int encode_breakout_thresh; int encode_breakout_thresh;
// In real time encoding, increase the threshold for NEWMV.
int elevate_newmv_thresh;
// default interp filter choice // default interp filter choice
INTERP_FILTER default_interp_filter; INTERP_FILTER default_interp_filter;