From: Yunqing Wang <yunqingwang@google.com>
Date: Tue, 25 Oct 2016 17:47:21 +0000 (-0700)
Subject: Modify the encoder multi-thread unit test
X-Git-Tag: v1.6.1~150^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c327b3f0b04f9d99756d0ef208b2d9e025958e64;p=libvpx

Modify the encoder multi-thread unit test

Modified the encoder multi-thread test so that it included cpu-used=0 and
frame-parallel=0.

frame_parallel_decoding_mode is 1 by default, which disables probability
updating and gives lower encoding quality. Current VP9 multi-threading
encoder and decoder support probability updating. To test this part, we
should turn on it in the unit test, namely, setting frame-parallel to 0.

Change-Id: Ia1f86e01f0de628f50d819ae31509de3e1b6c755
---

diff --git a/test/vp9_ethread_test.cc b/test/vp9_ethread_test.cc
index 804dc8956..f89f852b6 100644
--- a/test/vp9_ethread_test.cc
+++ b/test/vp9_ethread_test.cc
@@ -65,6 +65,7 @@ class VPxEncoderThreadTest
         encoder->Control(VP8E_SET_ARNR_MAXFRAMES, 7);
         encoder->Control(VP8E_SET_ARNR_STRENGTH, 5);
         encoder->Control(VP8E_SET_ARNR_TYPE, 3);
+        encoder->Control(VP9E_SET_FRAME_PARALLEL_DECODING, 0);
       } else {
         encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 0);
         encoder->Control(VP9E_SET_AQ_MODE, 3);
@@ -127,7 +128,7 @@ VP9_INSTANTIATE_TEST_CASE(VPxEncoderThreadTest,
                           ::testing::Values(::libvpx_test::kTwoPassGood,
                                             ::libvpx_test::kOnePassGood,
                                             ::libvpx_test::kRealTime),
-                          ::testing::Range(1, 9),   // cpu_used
+                          ::testing::Range(0, 9),   // cpu_used
                           ::testing::Range(0, 3),   // tile_columns
                           ::testing::Range(2, 5));  // threads
 }  // namespace