commit fddea5150255cb65e36001fa44f4c31908905177
author Wan-Teh Chang <wtc@google.com> Thu Feb 18 17:08:38 2021 -0800
committer Wan-Teh Chang <wtc@google.com> Wed Feb 24 14:33:32 2021 +0000
tree 1cfac9dac9d3c908b4177e0bfc65f33e07ddd3a9
parent 4276357b3490223cefe9296d72e25c4d64caa473

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

test/motion_vector_test.cc

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;