commit 2003f68a71c7be2c2cf415eb3654cc9e12684a82
author Wan-Teh Chang <wtc@google.com> Tue Apr 20 09:56:15 2021 -0700
committer Wan-Teh Chang <wtc@google.com> Tue Apr 20 21:00:01 2021 +0000
tree 99896b0f47c0267b65e9f158e063715e3f8030d9
parent 76b223e5d50332a5b37c723b1df272d39036e381

Add speed 6 to AVxEncoderThreadRTTest

Remove AVxEncoderThreadRTTestLarge because it doesn't make sense to test
speed 0, 2, 4 with realtime configuration.

Note: In realtime only build (CONFIG_REALTIME_ONLY=1) we cannot test
lower cpu_used settings 0..4 because AV1_COMMON.mi_params.mi_grid_base
is not set up properly.

Bug: aomedia:3001
Change-Id: I6a2534cc1e27a64ee1869a82fe5468aef25b4618

test/ethread_test.cc

diff --git a/test/ethread_test.cc b/test/ethread_test.cc
index 96e2dfe..06aad42 100644
--- a/test/ethread_test.cc
+++ b/test/ethread_test.cc
@@ -439,11 +439,12 @@
   DoTest();
 }
 
-// Test cpu_used 7, 8, 9 here.
+// For real time mode, test speed 6, 7, 8, 9.
 AV1_INSTANTIATE_TEST_SUITE(AVxEncoderThreadRTTest,
                            ::testing::Values(::libaom_test::kRealTime),
-                           ::testing::Values(7, 8, 9), ::testing::Values(0, 2),
-                           ::testing::Values(0, 2), ::testing::Values(0, 1));
+                           ::testing::Values(6, 7, 8, 9),
+                           ::testing::Values(0, 2), ::testing::Values(0, 2),
+                           ::testing::Values(0, 1));
 
 #if !CONFIG_REALTIME_ONLY
 class AVxEncoderThreadTestLarge : public AVxEncoderThreadTest {};
@@ -454,14 +455,6 @@
   DoTest();
 }
 
-class AVxEncoderThreadRTTestLarge : public AVxEncoderThreadTest {};
-
-TEST_P(AVxEncoderThreadRTTestLarge, EncoderResultTest) {
-  cfg_.large_scale_tile = 0;
-  decoder_->Control(AV1_SET_TILE_MODE, 0);
-  DoTest();
-}
-
 TEST_P(AVxEncoderThreadTest, EncoderResultTest) {
   cfg_.large_scale_tile = 0;
   decoder_->Control(AV1_SET_TILE_MODE, 0);
@@ -512,13 +505,6 @@
                            ::testing::Values(1, 6), ::testing::Values(1, 6),
                            ::testing::Values(0, 1));
 
-// Test cpu_used 0, 2, 4 and 6.
-AV1_INSTANTIATE_TEST_SUITE(AVxEncoderThreadRTTestLarge,
-                           ::testing::Values(::libaom_test::kRealTime),
-                           ::testing::Values(0, 2, 4, 6),
-                           ::testing::Values(1, 6), ::testing::Values(1, 6),
-                           ::testing::Values(0, 1));
-
 // Test cpu_used 0, 2, 4 and 8.
 AV1_INSTANTIATE_TEST_SUITE(AVxEncoderThreadAllIntraTestLarge,
                            ::testing::Values(::libaom_test::kAllIntra),