Merge "Fix using screen content tuning in all the cpu speed tests."

ed5d2e71 · Alex Converse · Gerrit Code Review · 825e7542 · e17f6347 · ed5d2e71
Commit ed5d2e71 authored Mar 17, 2016 by Alex Converse Committed by Gerrit Code Review Mar 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

test/cpu_speed_test.cc test/cpu_speed_test.cc +1 -1

No files found.
--- a/test/cpu_speed_test.cc
+++ b/test/cpu_speed_test.cc
@@ -50,7 +50,7 @@ class CpuSpeedTest
                                  ::libvpx_test::Encoder *encoder) {
    if (video->frame() == 1) {
      encoder->Control(VP8E_SET_CPUUSED, set_cpu_used_);
-      encoder->Control(VP9E_SET_TUNE_CONTENT, VP9E_CONTENT_SCREEN);
+      encoder->Control(VP9E_SET_TUNE_CONTENT, tune_content_);
      if (encoding_mode_ != ::libvpx_test::kRealTime) {
        encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 1);
        encoder->Control(VP8E_SET_ARNR_MAXFRAMES, 7);