shithub: libvpx

Info  •  Files  •  Log  •  Branches

libvpx,vp9_datarate_test: drop one-pass vod mode

this test is only useful for realtime mode testing given the number of
frames and that one-pass vod has never been a primary focus for
development.

BUG=webm:1512

Change-Id: I23208393a5fcc5bcf9b267fab4b0d1aad500918a

--- a/test/vp9_datarate_test.cc

+++ b/test/vp9_datarate_test.cc

@@ -242,11 +242,10 @@

   }

 };

-// Params: test mode, speed setting and index for bitrate array.

+// Params: speed setting and index for bitrate array.

 class DatarateTestVP9LargeVBR

     : public DatarateTestVP9,

-      public ::libvpx_test::CodecTestWith3Params<libvpx_test::TestMode, int,

-                                                 int> {

+      public ::libvpx_test::CodecTestWith2Params<int, int> {

  public:

   DatarateTestVP9LargeVBR() : DatarateTestVP9(GET_PARAM(0)) {}

@@ -253,8 +252,8 @@

  protected:

   virtual void SetUp() {

     InitializeConfig();

-    SetMode(GET_PARAM(1));

-    set_cpu_used_ = GET_PARAM(2);

+    SetMode(::libvpx_test::kRealTime);

+    set_cpu_used_ = GET_PARAM(1);

     ResetModel();

   }

 };

@@ -271,7 +270,7 @@

                                        30, 1, 0, 300);

   const int bitrates[2] = { 400, 800 };

-  const int bitrate_index = GET_PARAM(3);

+  const int bitrate_index = GET_PARAM(2);

   cfg_.rc_target_bitrate = bitrates[bitrate_index];

   ResetModel();

   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));

@@ -298,7 +297,7 @@

   ::libvpx_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288,

                                        30, 1, 0, 300);

   const int bitrates[2] = { 400, 800 };

-  const int bitrate_index = GET_PARAM(3);

+  const int bitrate_index = GET_PARAM(2);

   cfg_.rc_target_bitrate = bitrates[bitrate_index];

   ResetModel();

   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));

@@ -327,7 +326,7 @@

   ::libvpx_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288,

                                        30, 1, 0, 300);

   const int bitrates[2] = { 400, 800 };

-  const int bitrate_index = GET_PARAM(3);

+  const int bitrate_index = GET_PARAM(2);

   cfg_.rc_target_bitrate = bitrates[bitrate_index];

   ResetModel();

   frame_parallel_decoding_mode_ = 0;

@@ -887,10 +886,8 @@

 VP9_INSTANTIATE_TEST_CASE(DatarateTestVP9RealTimeMultiBR,

                           ::testing::Range(5, 10), ::testing::Range(0, 4));

-VP9_INSTANTIATE_TEST_CASE(DatarateTestVP9LargeVBR,

-                          ::testing::Values(::libvpx_test::kOnePassGood,

-                                            ::libvpx_test::kRealTime),

-                          ::testing::Range(2, 9), ::testing::Range(0, 2));

+VP9_INSTANTIATE_TEST_CASE(DatarateTestVP9LargeVBR, ::testing::Range(5, 9),

+                          ::testing::Range(0, 2));

 VP9_INSTANTIATE_TEST_CASE(DatarateTestVP9RealTime, ::testing::Range(5, 10));