shithub: libvpx

Info  •  Files  •  Log  •  Branches

Disable temporal/spatial svc test in VP10

The svc tests are disabled since it is not supported in VP10.

Change-Id: Ie6801e7a573b27afd1ea951bf037ccbae1201e8b

--- a/test/error_resilience_test.cc

+++ b/test/error_resilience_test.cc

@@ -20,10 +20,11 @@

 const int kMaxDroppableFrames = 12;

 class ErrorResilienceTestLarge : public ::libvpx_test::EncoderTest,

-    public ::libvpx_test::CodecTestWithParam<libvpx_test::TestMode> {

+    public ::libvpx_test::CodecTestWith2Params<libvpx_test::TestMode, bool> {

  protected:

   ErrorResilienceTestLarge()

       : EncoderTest(GET_PARAM(0)),

+        svc_support_(GET_PARAM(2)),

         psnr_(0.0),

         nframes_(0),

         mismatch_psnr_(0.0),

@@ -193,6 +194,8 @@

      pattern_switch_ = frame_switch;

    }

+  bool svc_support_;

+

  private:

   double psnr_;

   unsigned int nframes_;

@@ -302,6 +305,10 @@

 // two layer temporal pattern. The base layer does not predict from the top

 // layer, so successful decoding is expected.

 TEST_P(ErrorResilienceTestLarge, 2LayersDropEnhancement) {

+  // This test doesn't run if SVC is not supported.

+  if (!svc_support_)

+    return;

+

   const vpx_rational timebase = { 33333333, 1000000000 };

   cfg_.g_timebase = timebase;

   cfg_.rc_target_bitrate = 500;

@@ -347,6 +354,10 @@

 // for a two layer temporal pattern, where at some point in the

 // sequence, the LAST ref is not used anymore.

 TEST_P(ErrorResilienceTestLarge, 2LayersNoRefLast) {

+  // This test doesn't run if SVC is not supported.

+  if (!svc_support_)

+    return;

+

   const vpx_rational timebase = { 33333333, 1000000000 };

   cfg_.g_timebase = timebase;

   cfg_.rc_target_bitrate = 500;

@@ -579,9 +590,13 @@

   }

 }

-VP8_INSTANTIATE_TEST_CASE(ErrorResilienceTestLarge, ONE_PASS_TEST_MODES);

+VP8_INSTANTIATE_TEST_CASE(ErrorResilienceTestLarge, ONE_PASS_TEST_MODES,

+                          ::testing::Values(true));

 VP8_INSTANTIATE_TEST_CASE(ErrorResilienceTestLargeCodecControls,

                           ONE_PASS_TEST_MODES);

-VP9_INSTANTIATE_TEST_CASE(ErrorResilienceTestLarge, ONE_PASS_TEST_MODES);

-VP10_INSTANTIATE_TEST_CASE(ErrorResilienceTestLarge, ONE_PASS_TEST_MODES);

+VP9_INSTANTIATE_TEST_CASE(ErrorResilienceTestLarge, ONE_PASS_TEST_MODES,

+                          ::testing::Values(true));

+// SVC-related tests don't run for VP10 since SVC is not supported.

+VP10_INSTANTIATE_TEST_CASE(ErrorResilienceTestLarge, ONE_PASS_TEST_MODES,

+                           ::testing::Values(false));

 }  // namespace