Merge "put back in lost speedups" into experimental

5da753be · Jim Bankoski · Gerrit Code Review · 0835a353 · 9e176494 · 5da753be
Commit 5da753be authored May 31, 2013 by Jim Bankoski Committed by Gerrit Code Review May 31, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

vp9/encoder/vp9_onyx_if.c vp9/encoder/vp9_onyx_if.c +7 -0

No files found.
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -760,6 +760,13 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
  sf->static_segmentation = 0;
 #endif
      sf->mb16_breakout = 0;
+
+      if (speed > 0) {
+        sf->optimize_coefficients = 0;
+        sf->no_skip_block4x4_search = 0;
+        sf->comp_inter_joint_search = 0;
+        sf->first_step = 1;
+      }
      break;

  }; /* switch */