Merge the InitializeConfig() and SetMode() methods
Merge the InitializeConfig() and SetMode() methods of the EncoderTest
class. Subclasses of EncoderTest always call InitializeConfig() and
SetMode() (in that order) in their SetUp() methods. So these two methods
can be combined. This allows us to pass a 'usage' argument corresponding
to the TestMode enum to codec_->DefaultEncoderConfig().
Remove the assignments that set cfg_.g_lag_in_frames and
cfg_.rc_end_usage to their current (default) values.
BUG=aomedia:2966
Change-Id: I2335f91fbe49c7ab46e4a0c8a73d4fdbfeec3eb2
diff --git a/test/active_map_test.cc b/test/active_map_test.cc
index 4b0ae7a..4e30f55 100644
--- a/test/active_map_test.cc
+++ b/test/active_map_test.cc
@@ -30,8 +30,7 @@
virtual ~ActiveMapTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
+ InitializeConfig(GET_PARAM(1));
cpu_used_ = GET_PARAM(2);
}
diff --git a/test/altref_test.cc b/test/altref_test.cc
index a09f7dd..1334b4a 100644
--- a/test/altref_test.cc
+++ b/test/altref_test.cc
@@ -61,8 +61,7 @@
virtual ~AltRefFramePresenceTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(altref_test_params_.encoding_mode);
+ InitializeConfig(altref_test_params_.encoding_mode);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = rc_end_usage_;
@@ -155,8 +154,7 @@
virtual ~GoldenFrameIntervalTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(gf_interval_param_.encoding_mode);
+ InitializeConfig(gf_interval_param_.encoding_mode);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = rc_end_usage_;
diff --git a/test/aq_segment_test.cc b/test/aq_segment_test.cc
index e2715a1..4e52b55 100644
--- a/test/aq_segment_test.cc
+++ b/test/aq_segment_test.cc
@@ -28,8 +28,7 @@
virtual ~AqSegmentTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
+ InitializeConfig(GET_PARAM(1));
set_cpu_used_ = GET_PARAM(2);
aq_mode_ = 0;
}
diff --git a/test/arf_freq_test.cc b/test/arf_freq_test.cc
index 0780cd7..0bf47e6 100644
--- a/test/arf_freq_test.cc
+++ b/test/arf_freq_test.cc
@@ -87,14 +87,10 @@
virtual ~ArfFreqTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(test_encode_param_.mode);
+ InitializeConfig(test_encode_param_.mode);
if (test_encode_param_.mode != ::libaom_test::kRealTime) {
cfg_.g_lag_in_frames = 25;
- cfg_.rc_end_usage = AOM_VBR;
} else {
- cfg_.g_lag_in_frames = 0;
- cfg_.rc_end_usage = AOM_CBR;
cfg_.rc_buf_sz = 1000;
cfg_.rc_buf_initial_sz = 500;
cfg_.rc_buf_optimal_sz = 600;
diff --git a/test/av1_encoder_parms_get_to_decoder.cc b/test/av1_encoder_parms_get_to_decoder.cc
index 717584d..7bdb264 100644
--- a/test/av1_encoder_parms_get_to_decoder.cc
+++ b/test/av1_encoder_parms_get_to_decoder.cc
@@ -88,8 +88,7 @@
virtual ~AVxEncoderParmsGetToDecoder() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(::libaom_test::kTwoPassGood);
+ InitializeConfig(::libaom_test::kTwoPassGood);
cfg_.g_lag_in_frames = 25;
test_video_ = kAV1ParamPassingTestVector;
cfg_.rc_target_bitrate = test_video_.bitrate;
diff --git a/test/av1_ext_tile_test.cc b/test/av1_ext_tile_test.cc
index ad45667..c4f9cdc 100644
--- a/test/av1_ext_tile_test.cc
+++ b/test/av1_ext_tile_test.cc
@@ -64,8 +64,7 @@
}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
cfg_.g_lag_in_frames = 0;
cfg_.rc_end_usage = AOM_VBR;
diff --git a/test/block_test.cc b/test/block_test.cc
index 510a756..9cf5b02 100644
--- a/test/block_test.cc
+++ b/test/block_test.cc
@@ -143,8 +143,7 @@
virtual ~SuperBlockSizeTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = rc_end_usage_;
diff --git a/test/borders_test.cc b/test/borders_test.cc
index 841f0d9..bf9cc8b 100644
--- a/test/borders_test.cc
+++ b/test/borders_test.cc
@@ -26,10 +26,7 @@
BordersTestLarge() : EncoderTest(GET_PARAM(0)) {}
virtual ~BordersTestLarge() {}
- virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
- }
+ virtual void SetUp() { InitializeConfig(GET_PARAM(1)); }
virtual void PreEncodeFrameHook(::libaom_test::VideoSource *video,
::libaom_test::Encoder *encoder) {
diff --git a/test/cpu_speed_test.cc b/test/cpu_speed_test.cc
index 9ef3a5c..5396bec 100644
--- a/test/cpu_speed_test.cc
+++ b/test/cpu_speed_test.cc
@@ -31,14 +31,9 @@
virtual ~CpuSpeedTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
if (encoding_mode_ != ::libaom_test::kRealTime) {
cfg_.g_lag_in_frames = 25;
- cfg_.rc_end_usage = AOM_VBR;
- } else {
- cfg_.g_lag_in_frames = 0;
- cfg_.rc_end_usage = AOM_CBR;
}
}
diff --git a/test/datarate_test.cc b/test/datarate_test.cc
index d0b513d..2ff074f 100644
--- a/test/datarate_test.cc
+++ b/test/datarate_test.cc
@@ -38,8 +38,7 @@
virtual ~DatarateTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
+ InitializeConfig(GET_PARAM(1));
ResetModel();
}
@@ -252,8 +251,7 @@
virtual ~DatarateTestFrameDropLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
+ InitializeConfig(GET_PARAM(1));
ResetModel();
}
@@ -370,8 +368,7 @@
virtual ~DatarateTestSpeedChangeRealtime() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
+ InitializeConfig(GET_PARAM(1));
ResetModel();
}
diff --git a/test/datarate_test.h b/test/datarate_test.h
index 05df64d..0396034 100644
--- a/test/datarate_test.h
+++ b/test/datarate_test.h
@@ -30,11 +30,6 @@
protected:
virtual ~DatarateTest() {}
- virtual void SetUp() {
- InitializeConfig();
- ResetModel();
- }
-
virtual void ResetModel() {
last_pts_ = 0;
bits_in_buffer_model_ = cfg_.rc_target_bitrate * cfg_.rc_buf_initial_sz;
diff --git a/test/decode_multithreaded_test.cc b/test/decode_multithreaded_test.cc
index 5224dcc..5a13f75 100644
--- a/test/decode_multithreaded_test.cc
+++ b/test/decode_multithreaded_test.cc
@@ -69,10 +69,7 @@
delete multi_thread_dec_[i];
}
- virtual void SetUp() {
- InitializeConfig();
- SetMode(libaom_test::kTwoPassGood);
- }
+ virtual void SetUp() { InitializeConfig(libaom_test::kTwoPassGood); }
virtual void PreEncodeFrameHook(libaom_test::VideoSource *video,
libaom_test::Encoder *encoder) {
diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc
index d8a19be..982f7d9 100644
--- a/test/encode_test_driver.cc
+++ b/test/encode_test_driver.cc
@@ -83,28 +83,19 @@
ASSERT_EQ(AOM_CODEC_OK, res) << EncoderError();
}
-void EncoderTest::InitializeConfig() {
- const aom_codec_err_t res = codec_->DefaultEncoderConfig(&cfg_, 0);
- ASSERT_EQ(AOM_CODEC_OK, res);
-}
-
-void EncoderTest::SetMode(TestMode mode) {
+void EncoderTest::InitializeConfig(TestMode mode) {
+ int usage = AOM_USAGE_GOOD_QUALITY;
switch (mode) {
case kOnePassGood:
case kTwoPassGood: break;
- case kRealTime: {
- cfg_.g_usage = AOM_USAGE_REALTIME;
- cfg_.g_lag_in_frames = 0;
- cfg_.rc_end_usage = AOM_CBR;
- break;
- }
+ case kRealTime: usage = AOM_USAGE_REALTIME; break;
default: ASSERT_TRUE(false) << "Unexpected mode " << mode;
}
mode_ = mode;
- if (mode == kTwoPassGood)
- passes_ = 2;
- else
- passes_ = 1;
+ passes_ = (mode == kTwoPassGood) ? 2 : 1;
+
+ const aom_codec_err_t res = codec_->DefaultEncoderConfig(&cfg_, usage);
+ ASSERT_EQ(AOM_CODEC_OK, res);
}
static bool compare_plane(const uint8_t *const buf1, int stride1,
diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h
index 9744b11..3a443b4 100644
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -186,11 +186,9 @@
virtual ~EncoderTest() {}
- // Initialize the cfg_ member with the default configuration.
- void InitializeConfig();
-
- // Map the TestMode enum to the passes_ variables.
- void SetMode(TestMode mode);
+ // Initialize the cfg_ member with the default configuration for the
+ // TestMode enum and maps the TestMode enum to the passes_ variable.
+ void InitializeConfig(TestMode mode);
// Set encoder flag.
void set_init_flags(aom_codec_flags_t flag) { init_flags_ = flag; }
diff --git a/test/end_to_end_test.cc b/test/end_to_end_test.cc
index 82a4a8c..4c224a8 100644
--- a/test/end_to_end_test.cc
+++ b/test/end_to_end_test.cc
@@ -106,14 +106,10 @@
virtual ~EndToEndTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
if (encoding_mode_ != ::libaom_test::kRealTime) {
cfg_.g_lag_in_frames = 5;
- cfg_.rc_end_usage = AOM_VBR;
} else {
- cfg_.g_lag_in_frames = 0;
- cfg_.rc_end_usage = AOM_CBR;
cfg_.rc_buf_sz = 1000;
cfg_.rc_buf_initial_sz = 500;
cfg_.rc_buf_optimal_sz = 600;
diff --git a/test/error_resilience_test.cc b/test/error_resilience_test.cc
index a30de4f..31906a4 100644
--- a/test/error_resilience_test.cc
+++ b/test/error_resilience_test.cc
@@ -58,10 +58,7 @@
init_flags_ = AOM_CODEC_USE_PSNR;
}
- virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
- }
+ virtual void SetUp() { InitializeConfig(encoding_mode_); }
virtual void BeginPassHook(unsigned int /*pass*/) {
psnr_ = 0.0;
@@ -478,8 +475,7 @@
virtual ~SFramePresenceTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = rc_end_usage_;
diff --git a/test/ethread_test.cc b/test/ethread_test.cc
index 9c7e5d1..5bf8762 100644
--- a/test/ethread_test.cc
+++ b/test/ethread_test.cc
@@ -40,8 +40,7 @@
virtual ~AVxFirstPassEncoderThreadTest() { free(firstpass_stats_.buf); }
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
cfg_.g_lag_in_frames = 35;
cfg_.rc_end_usage = AOM_VBR;
@@ -226,17 +225,13 @@
virtual ~AVxEncoderThreadTest() { delete decoder_; }
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
if (encoding_mode_ != ::libaom_test::kRealTime) {
cfg_.g_lag_in_frames = 6;
- cfg_.rc_end_usage = AOM_VBR;
cfg_.rc_2pass_vbr_minsection_pct = 5;
cfg_.rc_2pass_vbr_maxsection_pct = 2000;
} else {
- cfg_.g_lag_in_frames = 0;
- cfg_.rc_end_usage = AOM_CBR;
cfg_.g_error_resilient = 1;
}
cfg_.rc_max_quantizer = 56;
diff --git a/test/frame_size_tests.cc b/test/frame_size_tests.cc
index 1546012..6ee6d7d 100644
--- a/test/frame_size_tests.cc
+++ b/test/frame_size_tests.cc
@@ -22,10 +22,7 @@
: EncoderTest(&::libaom_test::kAV1), expected_res_(AOM_CODEC_OK) {}
virtual ~AV1FrameSizeTests() {}
- virtual void SetUp() {
- InitializeConfig();
- SetMode(::libaom_test::kRealTime);
- }
+ virtual void SetUp() { InitializeConfig(::libaom_test::kRealTime); }
virtual bool HandleDecodeResult(const aom_codec_err_t res_dec,
libaom_test::Decoder *decoder) {
diff --git a/test/fwd_kf_test.cc b/test/fwd_kf_test.cc
index 8b0fb69..4bfb225 100644
--- a/test/fwd_kf_test.cc
+++ b/test/fwd_kf_test.cc
@@ -45,8 +45,7 @@
virtual ~ForwardKeyTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cpu_used_ = 2;
@@ -142,8 +141,7 @@
virtual ~ForwardKeyPresenceTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = end_usage_check_;
diff --git a/test/gf_pyr_height_test.cc b/test/gf_pyr_height_test.cc
index aac9cb6..a2d1a8f 100644
--- a/test/gf_pyr_height_test.cc
+++ b/test/gf_pyr_height_test.cc
@@ -82,8 +82,7 @@
virtual ~GFPyrHeightTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cpu_used_ = 4;
diff --git a/test/horz_superres_test.cc b/test/horz_superres_test.cc
index 9fcf405..9733344 100644
--- a/test/horz_superres_test.cc
+++ b/test/horz_superres_test.cc
@@ -103,8 +103,7 @@
virtual ~HorzSuperresEndToEndTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(::libaom_test::kTwoPassGood);
+ InitializeConfig(::libaom_test::kTwoPassGood);
cfg_.g_lag_in_frames = 5;
cfg_.rc_end_usage = AOM_Q;
cfg_.rc_target_bitrate = kBitrate;
@@ -207,8 +206,7 @@
virtual ~HorzSuperresFixedEndToEndTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(::libaom_test::kTwoPassGood);
+ InitializeConfig(::libaom_test::kTwoPassGood);
cfg_.g_lag_in_frames = 5;
cfg_.rc_end_usage = AOM_VBR;
cfg_.rc_target_bitrate = kBitrate;
@@ -318,8 +316,7 @@
virtual ~HorzSuperresQThreshEndToEndTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(::libaom_test::kTwoPassGood);
+ InitializeConfig(::libaom_test::kTwoPassGood);
cfg_.g_lag_in_frames = 5;
cfg_.rc_end_usage = AOM_VBR;
cfg_.rc_target_bitrate = kBitrate;
diff --git a/test/kf_test.cc b/test/kf_test.cc
index 0b36881..cc2cc89 100644
--- a/test/kf_test.cc
+++ b/test/kf_test.cc
@@ -48,8 +48,7 @@
virtual ~KeyFrameIntervalTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = end_usage_check_;
@@ -126,8 +125,7 @@
virtual ~ForcedKeyTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
cfg_.rc_end_usage = rc_end_usage_;
cfg_.g_threads = 0;
cfg_.kf_max_dist = 30;
diff --git a/test/level_test.cc b/test/level_test.cc
index 82ada98..f512c5a 100644
--- a/test/level_test.cc
+++ b/test/level_test.cc
@@ -42,14 +42,10 @@
virtual ~LevelTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
if (encoding_mode_ != ::libaom_test::kRealTime) {
cfg_.g_lag_in_frames = 5;
- cfg_.rc_end_usage = AOM_VBR;
} else {
- cfg_.g_lag_in_frames = 0;
- cfg_.rc_end_usage = AOM_CBR;
cfg_.rc_buf_sz = 1000;
cfg_.rc_buf_initial_sz = 500;
cfg_.rc_buf_optimal_sz = 600;
diff --git a/test/lossless_test.cc b/test/lossless_test.cc
index b56b43a..92ab299 100644
--- a/test/lossless_test.cc
+++ b/test/lossless_test.cc
@@ -35,8 +35,7 @@
virtual ~LosslessTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
cfg_.rc_end_usage = rc_end_usage_;
}
diff --git a/test/metadata_test.cc b/test/metadata_test.cc
index c102b7a..fd3d5c4 100644
--- a/test/metadata_test.cc
+++ b/test/metadata_test.cc
@@ -60,10 +60,7 @@
virtual ~MetadataEncodeTest() {}
- virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
- }
+ virtual void SetUp() { InitializeConfig(GET_PARAM(1)); }
virtual void PreEncodeFrameHook(::libaom_test::VideoSource *video) {
aom_image_t *current_frame = video->img();
diff --git a/test/monochrome_test.cc b/test/monochrome_test.cc
index 4688961..6395c22 100644
--- a/test/monochrome_test.cc
+++ b/test/monochrome_test.cc
@@ -28,10 +28,7 @@
virtual ~MonochromeTest() {}
- virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
- }
+ virtual void SetUp() { InitializeConfig(GET_PARAM(1)); }
virtual void DecompressedFrameHook(const aom_image_t &img,
aom_codec_pts_t pts) {
diff --git a/test/motion_vector_test.cc b/test/motion_vector_test.cc
index 7516a36..f1f3ae03 100644
--- a/test/motion_vector_test.cc
+++ b/test/motion_vector_test.cc
@@ -46,14 +46,10 @@
virtual ~MotionVectorTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
if (encoding_mode_ != ::libaom_test::kRealTime) {
cfg_.g_lag_in_frames = 3;
- cfg_.rc_end_usage = AOM_VBR;
} else {
- cfg_.g_lag_in_frames = 0;
- cfg_.rc_end_usage = AOM_CBR;
cfg_.rc_buf_sz = 1000;
cfg_.rc_buf_initial_sz = 500;
cfg_.rc_buf_optimal_sz = 600;
diff --git a/test/quant_test.cc b/test/quant_test.cc
index 2ef3a76..9fca953 100644
--- a/test/quant_test.cc
+++ b/test/quant_test.cc
@@ -28,8 +28,7 @@
virtual ~QMTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
+ InitializeConfig(GET_PARAM(1));
set_cpu_used_ = GET_PARAM(2);
}
@@ -112,8 +111,7 @@
virtual ~QuantizerBoundsCheckTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = rc_end_usage_;
diff --git a/test/resize_test.cc b/test/resize_test.cc
index adc9bb5..cb09a9a 100644
--- a/test/resize_test.cc
+++ b/test/resize_test.cc
@@ -201,10 +201,7 @@
virtual ~ResizeTest() {}
- virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
- }
+ virtual void SetUp() { InitializeConfig(GET_PARAM(1)); }
virtual void DecompressedFrameHook(const aom_image_t &img,
aom_codec_pts_t pts) {
@@ -409,8 +406,7 @@
}
virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
+ InitializeConfig(GET_PARAM(1));
set_cpu_used_ = GET_PARAM(2);
}
@@ -804,8 +800,7 @@
virtual ~ResizeModeTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = AOM_VBR;
diff --git a/test/rt_end_to_end_test.cc b/test/rt_end_to_end_test.cc
index 58b68e2..abd0b3c 100644
--- a/test/rt_end_to_end_test.cc
+++ b/test/rt_end_to_end_test.cc
@@ -86,8 +86,7 @@
virtual ~RTEndToEndTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(::libaom_test::kRealTime);
+ InitializeConfig(::libaom_test::kRealTime);
cfg_.g_threads = threads_;
cfg_.rc_buf_sz = 1000;
diff --git a/test/sb_multipass_test.cc b/test/sb_multipass_test.cc
index d2f56db..8ddc002 100644
--- a/test/sb_multipass_test.cc
+++ b/test/sb_multipass_test.cc
@@ -45,8 +45,7 @@
virtual ~AV1SBMultipassTest() { delete decoder_; }
virtual void SetUp() {
- InitializeConfig();
- SetMode(::libaom_test::kTwoPassGood);
+ InitializeConfig(::libaom_test::kTwoPassGood);
cfg_.g_lag_in_frames = 5;
cfg_.rc_end_usage = AOM_VBR;
diff --git a/test/scalability_test.cc b/test/scalability_test.cc
index d38d8ab..24dbef5 100644
--- a/test/scalability_test.cc
+++ b/test/scalability_test.cc
@@ -29,8 +29,7 @@
virtual ~ScalabilityTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
+ InitializeConfig(GET_PARAM(1));
num_spatial_layers_ = 2;
}
diff --git a/test/screen_content_test.cc b/test/screen_content_test.cc
index ecf2ef5..cd343a9 100644
--- a/test/screen_content_test.cc
+++ b/test/screen_content_test.cc
@@ -32,8 +32,7 @@
virtual ~ScreenContentToolsTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = rc_end_usage_;
diff --git a/test/still_picture_test.cc b/test/still_picture_test.cc
index 9800480..e2eef94 100644
--- a/test/still_picture_test.cc
+++ b/test/still_picture_test.cc
@@ -30,8 +30,7 @@
virtual ~StillPicturePresenceTest() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = AOM_Q;
diff --git a/test/superframe_test.cc b/test/superframe_test.cc
index b164286..c73ba15 100644
--- a/test/superframe_test.cc
+++ b/test/superframe_test.cc
@@ -34,10 +34,9 @@
virtual ~SuperframeTest() {}
virtual void SetUp() {
- InitializeConfig();
const SuperframeTestParam input = GET_PARAM(1);
const libaom_test::TestMode mode = std::get<kTestMode>(input);
- SetMode(mode);
+ InitializeConfig(mode);
sf_count_ = 0;
sf_count_max_ = INT_MAX;
n_tile_cols_ = std::get<kTileCols>(input);
diff --git a/test/svc_datarate_test.cc b/test/svc_datarate_test.cc
index a64a999..a171eb8 100644
--- a/test/svc_datarate_test.cc
+++ b/test/svc_datarate_test.cc
@@ -46,8 +46,7 @@
protected:
virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
+ InitializeConfig(GET_PARAM(1));
ResetModel();
}
diff --git a/test/tile_config_test.cc b/test/tile_config_test.cc
index 8c92c14..0098903 100644
--- a/test/tile_config_test.cc
+++ b/test/tile_config_test.cc
@@ -77,8 +77,7 @@
virtual ~UniformTileConfigTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = end_usage_check_;
@@ -144,8 +143,7 @@
virtual ~NonUniformTileConfigTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = rc_end_usage_;
@@ -301,8 +299,7 @@
virtual ~TileGroupTestLarge() {}
virtual void SetUp() {
- InitializeConfig();
- SetMode(encoding_mode_);
+ InitializeConfig(encoding_mode_);
const aom_rational timebase = { 1, 30 };
cfg_.g_timebase = timebase;
cfg_.rc_end_usage = AOM_Q;
diff --git a/test/tile_independence_test.cc b/test/tile_independence_test.cc
index 5f167be..888c3ab 100644
--- a/test/tile_independence_test.cc
+++ b/test/tile_independence_test.cc
@@ -52,10 +52,7 @@
delete inv_dec_;
}
- virtual void SetUp() {
- InitializeConfig();
- SetMode(libaom_test::kTwoPassGood);
- }
+ virtual void SetUp() { InitializeConfig(libaom_test::kTwoPassGood); }
virtual void PreEncodeFrameHook(libaom_test::VideoSource *video,
libaom_test::Encoder *encoder) {
diff --git a/test/time_stamp_test.cc b/test/time_stamp_test.cc
index 3e2fa97..205e5ba 100644
--- a/test/time_stamp_test.cc
+++ b/test/time_stamp_test.cc
@@ -74,10 +74,7 @@
TimestampTest() : EncoderTest(GET_PARAM(0)) {}
virtual ~TimestampTest() {}
- virtual void SetUp() {
- InitializeConfig();
- SetMode(GET_PARAM(1));
- }
+ virtual void SetUp() { InitializeConfig(GET_PARAM(1)); }
};
// Tests encoding in millisecond timebase.
