Reduce nightly encoder multithread tests

To resolve recent nightly test timeout issue, reduced nightly encoder
multithread tests and moved some to weekly(Large) tests.

Change-Id: Ib6c67b98bf03c3055736cbef8a6f765a5f26d2ca

test/ethread_test.cc

diff --git a/test/ethread_test.cc b/test/ethread_test.cc
index 2c7b4d1..f27c825 100644
--- a/test/ethread_test.cc
+++ b/test/ethread_test.cc
@@ -444,20 +444,19 @@
                           ::testing::Range(0, 6), ::testing::Range(0, 3),
                           ::testing::Range(0, 3));
 
-// For AV1, only test speed 0 to 3.
-// Here test cpu_used 2 and 3
+// For AV1, test speed 0, 1, 2, 3, 5.
+// Only test cpu_used 2 here.
 AV1_INSTANTIATE_TEST_CASE(AVxEncoderThreadTest,
                           ::testing::Values(::libaom_test::kTwoPassGood),
-                          ::testing::Range(2, 4), ::testing::Values(0, 2),
-                          ::testing::Values(0, 1), ::testing::Values(0, 1));
+                          ::testing::Values(2), ::testing::Values(0, 2),
+                          ::testing::Values(0, 2), ::testing::Values(0, 1));
 
-// Test cpu_used 0 and 1.
-AV1_INSTANTIATE_TEST_CASE(AVxEncoderThreadTestLarge,
-                          ::testing::Values(::libaom_test::kTwoPassGood,
-                                            ::libaom_test::kOnePassGood),
-                          ::testing::Range(0, 2), ::testing::Values(0, 1, 2, 6),
-                          ::testing::Values(0, 1, 2, 6),
-                          ::testing::Values(0, 1));
+// Test cpu_used 0, 1, 3 and 5.
+AV1_INSTANTIATE_TEST_CASE(
+    AVxEncoderThreadTestLarge,
+    ::testing::Values(::libaom_test::kTwoPassGood, ::libaom_test::kOnePassGood),
+    ::testing::Values(0, 1, 3, 5), ::testing::Values(0, 1, 2, 6),
+    ::testing::Values(0, 1, 2, 6), ::testing::Values(0, 1));
 
 class AVxEncoderThreadLSTest : public AVxEncoderThreadTest {
   virtual void SetTileSize(libaom_test::Encoder *encoder) {