Get some speed back for cpuused 1

and remove unused code.

Change-Id: If380440c4450294b5450b7a9eeb94a376846ec01

diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 420257f..e02e732 100644 (file)
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -718,10 +718,12 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
 #endif
       sf->comp_inter_joint_search_thresh = BLOCK_SIZE_SB8X8;
       sf->adpative_rd_thresh = 1;
-      if (speed > 0) {
+      if (speed == 1) {
         sf->comp_inter_joint_search_thresh = BLOCK_SIZE_TYPES;
         sf->optimize_coefficients = 0;
         sf->first_step = 1;
+        sf->use_avoid_tested_higherror = 1;
+        sf->adjust_thresholds_by_speed = 1;
       }
       if (speed == 2) {
         sf->comp_inter_joint_search_thresh = BLOCK_SIZE_SB8X8;