Merge "Add test for screen content coding tools in end to end test" into nextgenv2

1226e734 · Hui Su · Gerrit Code Review · 389efb28 · 827e1b3f · 1226e734
Commit 1226e734 authored Feb 25, 2016 by Hui Su Committed by Gerrit Code Review Feb 25, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

test/vp9_end_to_end_test.cc test/vp9_end_to_end_test.cc +5 -0

No files found.
--- a/test/vp9_end_to_end_test.cc
+++ b/test/vp9_end_to_end_test.cc
@@ -126,6 +126,11 @@ class EndToEndTestLarge
      encoder->Control(VP9E_SET_FRAME_PARALLEL_DECODING, 1);
      encoder->Control(VP9E_SET_TILE_COLUMNS, 4);
      encoder->Control(VP8E_SET_CPUUSED, cpu_used_);
+      // Test screen coding tools at cpu_used = 1 && encoding mode is two-pass.
+      if (cpu_used_ == 1 && encoding_mode_ == ::libvpx_test::kTwoPassGood)
+        encoder->Control(VP9E_SET_TUNE_CONTENT, VP9E_CONTENT_SCREEN);
+      else
+        encoder->Control(VP9E_SET_TUNE_CONTENT, VP9E_CONTENT_DEFAULT);
      if (encoding_mode_ != ::libvpx_test::kRealTime) {
        encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 1);
        encoder->Control(VP8E_SET_ARNR_MAXFRAMES, 7);