commit f9cd17dfc1ea44aefb509bbcbc6e407b67d441e5
author Wan-Teh Chang <wtc@google.com> Mon Apr 19 17:28:55 2021 -0700
committer Wan-Teh Chang <wtc@google.com> Tue Apr 20 02:11:18 2021 +0000
tree 8497ba01e437b280ef557cbbf4e0017e07acc514
parent 0d36ee380b206bd9b611f16e2145969e8f76a023

Move AVxEncoderThreadRTTestLarge outside #ifdef

Move AVxEncoderThreadRTTestLarge outside the #if !CONFIG_REALTIME_ONLY
block.

Bug: aomedia:3001
Change-Id: I44d0ec54bcfbee14bcd48726b1a1305e3df0cc46

test/ethread_test.cc

diff --git a/test/ethread_test.cc b/test/ethread_test.cc
index dc9cb5c..70fbb55 100644
--- a/test/ethread_test.cc
+++ b/test/ethread_test.cc
@@ -433,12 +433,27 @@
   DoTest();
 }
 
+class AVxEncoderThreadRTTestLarge : public AVxEncoderThreadTest {};
+
+TEST_P(AVxEncoderThreadRTTestLarge, EncoderResultTest) {
+  cfg_.large_scale_tile = 0;
+  decoder_->Control(AV1_SET_TILE_MODE, 0);
+  DoTest();
+}
+
 // Test cpu_used 7, 8, 9 here.
 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));
 
+// 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));
+
 #if !CONFIG_REALTIME_ONLY
 class AVxEncoderThreadTestLarge : public AVxEncoderThreadTest {};
 
@@ -448,14 +463,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);
@@ -482,13 +489,6 @@
                            ::testing::Values(0, 1, 3, 5),
                            ::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));
 #endif
 
 class AVxEncoderThreadLSTest : public AVxEncoderThreadTest {