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 14af265..af25b72 100644
--- a/test/altref_test.cc
+++ b/test/altref_test.cc
@@ -33,10 +33,6 @@
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 49505ee..7bfece8 100644
--- a/test/borders_test.cc
+++ b/test/borders_test.cc
@@ -27,10 +27,6 @@
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 9008728..36c6330 100644
--- a/test/config_test.cc
+++ b/test/config_test.cc
@@ -40,10 +40,6 @@
++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 a6a4b8e..a2c8291 100644
--- a/test/cq_test.cc
+++ b/test/cq_test.cc
@@ -42,10 +42,6 @@
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 85eeafb..287e805 100644
--- a/test/datarate_test.cc
+++ b/test/datarate_test.cc
@@ -36,10 +36,6 @@
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 6aeb96b..dbdc33c 100644
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -190,7 +190,9 @@
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 ddfbd0f..d4a6967 100644
--- a/test/error_resilience_test.cc
+++ b/test/error_resilience_test.cc
@@ -50,10 +50,6 @@
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 85ca0b9..f7572e8 100644
--- a/test/keyframe_test.cc
+++ b/test/keyframe_test.cc
@@ -31,10 +31,6 @@
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 0d591ad..7412a24 100644
--- a/test/resize_test.cc
+++ b/test/resize_test.cc
@@ -70,10 +70,6 @@
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 062ec6c..d91e7b1 100644
--- a/test/superframe_test.cc
+++ b/test/superframe_test.cc
@@ -33,10 +33,6 @@
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) {
