encode_test_driver: check for fatal failures

Make the base test be:
!(fatal || abort_) removing some redundancy in the encode tests

Change-Id: I8ffaf33fcf9a3030b38ea3e8eb94704cdc2fc920

diff --git a/test/altref_test.cc b/test/altref_test.cc
index 14af26574293ba43da3fe79a4491179ff50a3282..af25b72856e94b2237e29b0d993554532b356d7b 100644 (file)
--- a/test/altref_test.cc
+++ b/test/altref_test.cc
@@ -33,10 +33,6 @@ class AltRefTest : public ::libvpx_test::EncoderTest,
     altref_count_ = 0;
   }
 
-  virtual bool Continue() const {
-    return !HasFatalFailure() && !abort_;
-  }
-
   virtual void PreEncodeFrameHook(libvpx_test::VideoSource *video,
                                   libvpx_test::Encoder *encoder) {
     if (video->frame() == 1) {

diff --git a/test/borders_test.cc b/test/borders_test.cc
index 49505ee66c947d9ebb09d69de9365b08bbe27f58..7bfece81ce94f203e52e7cabe13f5234e21a9b0d 100644 (file)
--- a/test/borders_test.cc
+++ b/test/borders_test.cc
@@ -27,10 +27,6 @@ class BordersTest : public ::libvpx_test::EncoderTest,
     SetMode(GET_PARAM(1));
   }
 
-  virtual bool Continue() const {
-    return !HasFatalFailure() && !abort_;
-  }
-
   virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
                                   ::libvpx_test::Encoder *encoder) {
     if ( video->frame() == 1) {

diff --git a/test/config_test.cc b/test/config_test.cc
index 90087280b4c552ad67549173e60aa360754f39c1..36c63302bc0f3713b076a54576d8d74e72ba0c2d 100644 (file)
--- a/test/config_test.cc
+++ b/test/config_test.cc
@@ -40,10 +40,6 @@ class ConfigTest : public ::libvpx_test::EncoderTest,
     ++frame_count_out_;
   }
 
-  virtual bool Continue() const {
-    return !HasFatalFailure() && !abort_;
-  }
-
   unsigned int frame_count_in_;
   unsigned int frame_count_out_;
   unsigned int frame_count_max_;

diff --git a/test/cq_test.cc b/test/cq_test.cc
index a6a4b8ebd49efdf65cad758a0b0468b9f761d4fb..a2c829163739d5d4156c03a3a9318b0615e844af 100644 (file)
--- a/test/cq_test.cc
+++ b/test/cq_test.cc
@@ -42,10 +42,6 @@ class CQTest : public ::libvpx_test::EncoderTest,
     n_frames_ = 0;
   }
 
-  virtual bool Continue() const {
-    return !HasFatalFailure() && !abort_;
-  }
-
   virtual void PreEncodeFrameHook(libvpx_test::VideoSource *video,
                                   libvpx_test::Encoder *encoder) {
     if (video->frame() == 1) {

diff --git a/test/datarate_test.cc b/test/datarate_test.cc
index 85eeafbcc7cae5f1e219ffab2a1204ddfd2c560b..287e805842911f22aa09a653f1d07ff895e9328e 100644 (file)
--- a/test/datarate_test.cc
+++ b/test/datarate_test.cc
@@ -36,10 +36,6 @@ class DatarateTest : public ::libvpx_test::EncoderTest,
     duration_ = 0.0;
   }
 
-  virtual bool Continue() const {
-    return !HasFatalFailure() && !abort_;
-  }
-
   virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
                                   ::libvpx_test::Encoder *encoder) {
     const vpx_rational_t tb = video->timebase();

diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h
index 6aeb96b1fdfb62cdf1f4c800cc9555d7250f0611..dbdc33c8eb1be24d403e05af10b8d500fde11334 100644 (file)
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -190,7 +190,9 @@ class EncoderTest {
   virtual void PSNRPktHook(const vpx_codec_cx_pkt_t *pkt) {}
 
   // Hook to determine whether the encode loop should continue.
-  virtual bool Continue() const { return !abort_; }
+  virtual bool Continue() const {
+    return !(::testing::Test::HasFatalFailure() || abort_);
+  }
 
   const CodecFactory   *codec_;
   // Hook to determine whether to decode frame after encoding

diff --git a/test/error_resilience_test.cc b/test/error_resilience_test.cc
index ddfbd0fd86b48ee42161e3d661ac8671b3f5b8ca..d4a6967f61e0d60cf920684c9d2c7f55aa0f22e3 100644 (file)
--- a/test/error_resilience_test.cc
+++ b/test/error_resilience_test.cc
@@ -50,10 +50,6 @@ class ErrorResilienceTest : public ::libvpx_test::EncoderTest,
     mismatch_nframes_ = 0;
   }
 
-  virtual bool Continue() const {
-    return !HasFatalFailure() && !abort_;
-  }
-
   virtual void PSNRPktHook(const vpx_codec_cx_pkt_t *pkt) {
     psnr_ += pkt->data.psnr.psnr[0];
     nframes_++;

diff --git a/test/keyframe_test.cc b/test/keyframe_test.cc
index 85ca0b97556e0f614760565e656b68bcf6a9e0f2..f7572e8729baeeccb7ce62fd946a914a05a4ef4a 100644 (file)
--- a/test/keyframe_test.cc
+++ b/test/keyframe_test.cc
@@ -31,10 +31,6 @@ class KeyframeTest : public ::libvpx_test::EncoderTest,
     set_cpu_used_ = 0;
   }
 
-  virtual bool Continue() const {
-    return !HasFatalFailure() && !abort_;
-  }
-
   virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
                                   ::libvpx_test::Encoder *encoder) {
     if (kf_do_force_kf_)

diff --git a/test/resize_test.cc b/test/resize_test.cc
index 0d591ad87dbf1ecfb69671769ffead1e60970a7e..7412a2417ed6d2320949306cd0549a68a71fac66 100644 (file)
--- a/test/resize_test.cc
+++ b/test/resize_test.cc
@@ -70,10 +70,6 @@ class ResizeTest : public ::libvpx_test::EncoderTest,
     SetMode(GET_PARAM(1));
   }
 
-  virtual bool Continue() const {
-    return !HasFatalFailure() && !abort_;
-  }
-
   virtual void DecompressedFrameHook(const vpx_image_t &img,
                                      vpx_codec_pts_t pts) {
     frame_info_list_.push_back(FrameInfo(pts, img.d_w, img.d_h));

diff --git a/test/superframe_test.cc b/test/superframe_test.cc
index 062ec6c9e77ee630193e6e4931da6d53376a053b..d91e7b10b4f1a92f0578df901111c8135a139721 100644 (file)
--- a/test/superframe_test.cc
+++ b/test/superframe_test.cc
@@ -33,10 +33,6 @@ class SuperframeTest : public ::libvpx_test::EncoderTest,
     delete[] modified_buf_;
   }
 
-  virtual bool Continue() const {
-    return !HasFatalFailure() && !abort_;
-  }
-
   virtual void PreEncodeFrameHook(libvpx_test::VideoSource *video,
                                   libvpx_test::Encoder *encoder) {
     if (video->frame() == 1) {