test/*: rename MT tests to MultiThread
and add 'Thread' to FrameParallel tests; this ensures that filters used
for thread sanitizer pick up these tests. FrameParallel was an
exception in the filters, but it's better to be explicit in the name so
new cases don't miss it.
they all appear to pass with clang/gcc currently
Change-Id: I0b173b1d3faae49359c8232437b1c601b49cabd9
diff --git a/test/datarate_test.cc b/test/datarate_test.cc
index 57fc593..ee4f8c0 100644
--- a/test/datarate_test.cc
+++ b/test/datarate_test.cc
@@ -85,7 +85,7 @@
<< " The datarate for the file is greater than target by too much!";
}
- virtual void BasicRateTargetingMTCBRTest() {
+ virtual void BasicRateTargetingMultiThreadCBRTest() {
::libaom_test::I420VideoSource video("niklas_640_480_30.yuv", 640, 480, 30,
1, 0, 400);
cfg_.rc_buf_initial_sz = 500;
@@ -315,8 +315,8 @@
}
// Check basic rate targeting for CBR, with 4 threads
-TEST_P(DatarateTestLarge, BasicRateTargetingMTCBR) {
- BasicRateTargetingMTCBRTest();
+TEST_P(DatarateTestLarge, BasicRateTargetingMultiThreadCBR) {
+ BasicRateTargetingMultiThreadCBRTest();
}
// Check basic rate targeting for periodic key frame.
@@ -414,8 +414,8 @@
}
// Check basic rate targeting for CBR, with 4 threads
-TEST_P(DatarateTestRealtime, BasicRateTargetingMTCBR) {
- BasicRateTargetingMTCBRTest();
+TEST_P(DatarateTestRealtime, BasicRateTargetingMultiThreadCBR) {
+ BasicRateTargetingMultiThreadCBRTest();
}
// Check basic rate targeting for periodic key frame.
diff --git a/test/frame_parallel_enc_test.cc b/test/frame_parallel_enc_test.cc
index f623da5..cb14d39 100644
--- a/test/frame_parallel_enc_test.cc
+++ b/test/frame_parallel_enc_test.cc
@@ -22,11 +22,11 @@
namespace {
#if (CONFIG_FRAME_PARALLEL_ENCODE && CONFIG_FPMT_TEST && !CONFIG_REALTIME_ONLY)
-class AVxFrameParallelEncodeTest
+class AVxFrameParallelThreadEncodeTest
: public ::libaom_test::CodecTestWith3Params<int, int, int>,
public ::libaom_test::EncoderTest {
protected:
- AVxFrameParallelEncodeTest()
+ AVxFrameParallelThreadEncodeTest()
: EncoderTest(GET_PARAM(0)), encoder_initialized_(false),
set_cpu_used_(GET_PARAM(1)), tile_cols_(GET_PARAM(2)),
tile_rows_(GET_PARAM(3)) {
@@ -36,7 +36,7 @@
cfg.allow_lowbitdepth = 1;
decoder_ = codec_->CreateDecoder(cfg, 0);
}
- virtual ~AVxFrameParallelEncodeTest() { delete decoder_; }
+ virtual ~AVxFrameParallelThreadEncodeTest() { delete decoder_; }
virtual void SetUp() {
InitializeConfig(::libaom_test::kTwoPassGood);
@@ -150,43 +150,46 @@
std::vector<std::string> md5_dec_;
};
-class AVxFrameParallelEncodeHDResTestLarge : public AVxFrameParallelEncodeTest {
-};
+class AVxFrameParallelThreadEncodeHDResTestLarge
+ : public AVxFrameParallelThreadEncodeTest {};
-TEST_P(AVxFrameParallelEncodeHDResTestLarge, FrameParallelEncodeTest) {
+TEST_P(AVxFrameParallelThreadEncodeHDResTestLarge,
+ FrameParallelThreadEncodeTest) {
::libaom_test::Y4mVideoSource video("niklas_1280_720_30.y4m", 0, 60);
cfg_.rc_target_bitrate = 500;
DoTest(&video);
}
-class AVxFrameParallelEncodeLowResTestLarge
- : public AVxFrameParallelEncodeTest {};
+class AVxFrameParallelThreadEncodeLowResTestLarge
+ : public AVxFrameParallelThreadEncodeTest {};
-TEST_P(AVxFrameParallelEncodeLowResTestLarge, FrameParallelEncodeTest) {
+TEST_P(AVxFrameParallelThreadEncodeLowResTestLarge,
+ FrameParallelThreadEncodeTest) {
::libaom_test::YUVVideoSource video("hantro_collage_w352h288.yuv",
AOM_IMG_FMT_I420, 352, 288, 30, 1, 0, 60);
cfg_.rc_target_bitrate = 200;
DoTest(&video);
}
-class AVxFrameParallelEncodeLowResTest : public AVxFrameParallelEncodeTest {};
+class AVxFrameParallelThreadEncodeLowResTest
+ : public AVxFrameParallelThreadEncodeTest {};
-TEST_P(AVxFrameParallelEncodeLowResTest, FrameParallelEncodeTest) {
+TEST_P(AVxFrameParallelThreadEncodeLowResTest, FrameParallelThreadEncodeTest) {
::libaom_test::YUVVideoSource video("hantro_collage_w352h288.yuv",
AOM_IMG_FMT_I420, 352, 288, 30, 1, 0, 60);
cfg_.rc_target_bitrate = 200;
DoTest(&video);
}
-AV1_INSTANTIATE_TEST_SUITE(AVxFrameParallelEncodeHDResTestLarge,
+AV1_INSTANTIATE_TEST_SUITE(AVxFrameParallelThreadEncodeHDResTestLarge,
::testing::Values(2, 3, 4, 5, 6),
::testing::Values(0, 1, 2), ::testing::Values(0, 1));
-AV1_INSTANTIATE_TEST_SUITE(AVxFrameParallelEncodeLowResTestLarge,
+AV1_INSTANTIATE_TEST_SUITE(AVxFrameParallelThreadEncodeLowResTestLarge,
::testing::Values(2, 3), ::testing::Values(0, 1, 2),
::testing::Values(0, 1));
-AV1_INSTANTIATE_TEST_SUITE(AVxFrameParallelEncodeLowResTest,
+AV1_INSTANTIATE_TEST_SUITE(AVxFrameParallelThreadEncodeLowResTest,
::testing::Values(4, 5, 6), ::testing::Values(1),
::testing::Values(0));
#endif // CONFIG_FRAME_PARALLEL_ENCODE &&
diff --git a/test/svc_datarate_test.cc b/test/svc_datarate_test.cc
index 93d8fe6..eadb145 100644
--- a/test/svc_datarate_test.cc
+++ b/test/svc_datarate_test.cc
@@ -988,7 +988,7 @@
}
}
- virtual void BasicRateTargetingSVC3TL3SLHDMT2Test() {
+ virtual void BasicRateTargetingSVC3TL3SLHDMultiThread2Test() {
cfg_.rc_buf_initial_sz = 500;
cfg_.rc_buf_optimal_sz = 500;
cfg_.rc_buf_sz = 1000;
@@ -1030,7 +1030,7 @@
}
}
- virtual void BasicRateTargetingSVC3TL3SLHDMT4Test() {
+ virtual void BasicRateTargetingSVC3TL3SLHDMultiThread4Test() {
cfg_.rc_buf_initial_sz = 500;
cfg_.rc_buf_optimal_sz = 500;
cfg_.rc_buf_sz = 1000;
@@ -1684,13 +1684,13 @@
// Check basic rate targeting for CBR, for 3 spatial, 3 temporal layers,
// for 2 threads, 2 tile_columns, row-mt enabled.
-TEST_P(DatarateTestSVC, BasicRateTargetingSVC3TL3SLHDMT2) {
- BasicRateTargetingSVC3TL3SLHDMT2Test();
+TEST_P(DatarateTestSVC, BasicRateTargetingSVC3TL3SLHDMultiThread2) {
+ BasicRateTargetingSVC3TL3SLHDMultiThread2Test();
}
// Check basic rate targeting for CBR, for 3 spatial, 3 temporal layers,
// for 4 threads, 4 tile_columns, row-mt enabled.
-TEST_P(DatarateTestSVC, BasicRateTargetingSVC3TL3SLHDMT4) {
- BasicRateTargetingSVC3TL3SLHDMT4Test();
+TEST_P(DatarateTestSVC, BasicRateTargetingSVC3TL3SLHDMultiThread4) {
+ BasicRateTargetingSVC3TL3SLHDMultiThread4Test();
}
// Check basic rate targeting for CBR, for 3 spatial, 3 temporal layers,
