commit ed5d2e71c0ec7d9c89e82eb8aeff4abbb8027ee4
author Alex Converse <aconverse@google.com> Thu Mar 17 16:24:48 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 17 16:24:48 2016 +0000
tree 22e978aaad18c72d25c4466f256aa21a14866e5d
parent 825e754288e1437dde21f728ffe582305bf7708c
parent e17f6347b93397b17aab660c79d25d2071b69eb9

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

test/cpu_speed_test.cc

diff --git a/test/cpu_speed_test.cc b/test/cpu_speed_test.cc
index 3592a7e..572834c 100644
--- a/test/cpu_speed_test.cc
+++ b/test/cpu_speed_test.cc
@@ -50,7 +50,7 @@
                                   ::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);