libvpx: Pull from upstream

source/libvpx/test/error_resilience_test.cc

Index: source/libvpx/test/error_resilience_test.cc
===================================================================
--- source/libvpx/test/error_resilience_test.cc	(revision 263011)
+++ source/libvpx/test/error_resilience_test.cc	(working copy)
@@ -19,19 +19,20 @@
 const int kMaxErrorFrames = 12;
 const int kMaxDroppableFrames = 12;
 
-class ErrorResilienceTest : public ::libvpx_test::EncoderTest,
+class ErrorResilienceTestLarge : public ::libvpx_test::EncoderTest,
     public ::libvpx_test::CodecTestWithParam<libvpx_test::TestMode> {
  protected:
-  ErrorResilienceTest() : EncoderTest(GET_PARAM(0)),
-                          psnr_(0.0),
-                          nframes_(0),
-                          mismatch_psnr_(0.0),
-                          mismatch_nframes_(0),
-                          encoding_mode_(GET_PARAM(1)) {
+  ErrorResilienceTestLarge()
+      : EncoderTest(GET_PARAM(0)),
+        psnr_(0.0),
+        nframes_(0),
+        mismatch_psnr_(0.0),
+        mismatch_nframes_(0),
+        encoding_mode_(GET_PARAM(1)) {
     Reset();
   }
 
-  virtual ~ErrorResilienceTest() {}
+  virtual ~ErrorResilienceTestLarge() {}
 
   void Reset() {
     error_nframes_ = 0;
@@ -144,7 +145,7 @@
   libvpx_test::TestMode encoding_mode_;
 };
 
-TEST_P(ErrorResilienceTest, OnVersusOff) {
+TEST_P(ErrorResilienceTestLarge, OnVersusOff) {
   const vpx_rational timebase = { 33333333, 1000000000 };
   cfg_.g_timebase = timebase;
   cfg_.rc_target_bitrate = 2000;
@@ -179,7 +180,7 @@
 // if we lose (i.e., drop before decoding) a set of droppable
 // frames (i.e., frames that don't update any reference buffers).
 // Check both isolated and consecutive loss.
-TEST_P(ErrorResilienceTest, DropFramesWithoutRecovery) {
+TEST_P(ErrorResilienceTestLarge, DropFramesWithoutRecovery) {
   const vpx_rational timebase = { 33333333, 1000000000 };
   cfg_.g_timebase = timebase;
   cfg_.rc_target_bitrate = 500;
@@ -235,7 +236,7 @@
 #endif
 }
 
-VP8_INSTANTIATE_TEST_CASE(ErrorResilienceTest, ONE_PASS_TEST_MODES);
-VP9_INSTANTIATE_TEST_CASE(ErrorResilienceTest, ONE_PASS_TEST_MODES);
+VP8_INSTANTIATE_TEST_CASE(ErrorResilienceTestLarge, ONE_PASS_TEST_MODES);
+VP9_INSTANTIATE_TEST_CASE(ErrorResilienceTestLarge, ONE_PASS_TEST_MODES);
 
 }  // namespace