From 527e0731635f25abf591526129540e93c2b382fe Mon Sep 17 00:00:00 2001 From: Adrian Grange Date: Thu, 22 Jan 2015 14:53:18 -0800 Subject: [PATCH] Remove elevate_newmv_thresh from SPEED_FEATURES (unused) Change-Id: I78ef7f89586a329787f6bc4c58ec83af210989a3 --- vp9/encoder/vp9_rd.c | 4 ---- vp9/encoder/vp9_speed_features.c | 1 - vp9/encoder/vp9_speed_features.h | 3 --- 3 files changed, 8 deletions(-) diff --git a/vp9/encoder/vp9_rd.c b/vp9/encoder/vp9_rd.c index 375407d44..adbe0244d 100644 --- a/vp9/encoder/vp9_rd.c +++ b/vp9/encoder/vp9_rd.c @@ -570,10 +570,6 @@ void vp9_set_rd_speed_thresholds(VP9_COMP *cpi) { rd->thresh_mult[THR_NEWA] += 1000; rd->thresh_mult[THR_NEWG] += 1000; - // Adjust threshold only in real time mode, which only uses last - // reference frame. - rd->thresh_mult[THR_NEWMV] += sf->elevate_newmv_thresh; - rd->thresh_mult[THR_NEARMV] += 1000; rd->thresh_mult[THR_NEARA] += 1000; rd->thresh_mult[THR_COMP_NEARESTLA] += 1000; diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index 15831fbbe..81f3195fe 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -446,7 +446,6 @@ void vp9_set_speed_features_framesize_independent(VP9_COMP *cpi) { sf->always_this_block_size = BLOCK_16X16; sf->search_type_check_frequency = 50; sf->encode_breakout_thresh = 0; - sf->elevate_newmv_thresh = 0; // Recode loop tolerance %. sf->recode_tolerance = 25; sf->default_interp_filter = SWITCHABLE; diff --git a/vp9/encoder/vp9_speed_features.h b/vp9/encoder/vp9_speed_features.h index c2cfd62da..eaa0accdb 100644 --- a/vp9/encoder/vp9_speed_features.h +++ b/vp9/encoder/vp9_speed_features.h @@ -390,9 +390,6 @@ typedef struct SPEED_FEATURES { // enabled in real time mode. int encode_breakout_thresh; - // In real time encoding, increase the threshold for NEWMV. - int elevate_newmv_thresh; - // default interp filter choice INTERP_FILTER default_interp_filter; -- 2.40.0