8 files changed, 17 insertions, 14 deletions
diff --git a/test/avg_test.cc b/test/avg_test.cc
index e8cac0797..5455f05ed 100644
--- a/test/avg_test.cc
+++ b/test/avg_test.cc
@@ -263,6 +263,8 @@ class SatdTest : public ::testing::Test,
     EXPECT_EQ(expected, total);
   }
 
+  tran_low_t *GetCoeff() const { return src_; }
+
   int satd_size_;
 
  private:
@@ -317,6 +319,10 @@ class BlockErrorTestFP
     EXPECT_EQ(expected, total);
   }
 
+  tran_low_t *GetCoeff() const { return coeff_; }
+
+  tran_low_t *GetDQCoeff() const { return dqcoeff_; }
+
   int txfm_size_;
 
  private:
@@ -428,8 +434,9 @@ TEST_P(SatdTest, Random) {
 TEST_P(SatdTest, DISABLED_Speed) {
   const int kCountSpeedTestBlock = 20000;
   vpx_usec_timer timer;
-  DECLARE_ALIGNED(16, tran_low_t, coeff[1024]);
   const int blocksize = GET_PARAM(0);
+  FillRandom();
+  tran_low_t *coeff = GetCoeff();
 
   vpx_usec_timer_start(&timer);
   for (int i = 0; i < kCountSpeedTestBlock; ++i) {
@@ -472,9 +479,10 @@ TEST_P(BlockErrorTestFP, Random) {
 TEST_P(BlockErrorTestFP, DISABLED_Speed) {
   const int kCountSpeedTestBlock = 20000;
   vpx_usec_timer timer;
-  DECLARE_ALIGNED(16, tran_low_t, coeff[1024]);
-  DECLARE_ALIGNED(16, tran_low_t, dqcoeff[1024]);
   const int blocksize = GET_PARAM(0);
+  FillRandom();
+  tran_low_t *coeff = GetCoeff();
+  tran_low_t *dqcoeff = GetDQCoeff();
 
   vpx_usec_timer_start(&timer);
   for (int i = 0; i < kCountSpeedTestBlock; ++i) {
diff --git a/test/dct_partial_test.cc b/test/dct_partial_test.cc
index 6636f566b..ee23ebe5c 100644
--- a/test/dct_partial_test.cc
+++ b/test/dct_partial_test.cc
@@ -26,10 +26,10 @@
 #include "vpx/vpx_integer.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 
-using ::testing::make_tuple;
-using ::testing::tuple;
 using libvpx_test::ACMRandom;
 using libvpx_test::Buffer;
+using ::testing::make_tuple;
+using ::testing::tuple;
 
 namespace {
 typedef void (*PartialFdctFunc)(const int16_t *in, tran_low_t *out, int stride);
diff --git a/test/dct_test.cc b/test/dct_test.cc
index d696d8217..e7883c141 100644
--- a/test/dct_test.cc
+++ b/test/dct_test.cc
@@ -26,10 +26,10 @@
 #include "vpx/vpx_integer.h"
 #include "vpx_ports/mem.h"
 
-using ::testing::make_tuple;
-using ::testing::tuple;
 using libvpx_test::ACMRandom;
 using libvpx_test::Buffer;
+using ::testing::make_tuple;
+using ::testing::tuple;
 
 namespace {
 typedef void (*FdctFunc)(const int16_t *in, tran_low_t *out, int stride);
diff --git a/test/invalid_file_test.cc b/test/invalid_file_test.cc
index e9c658c69..9cfaa1f1f 100644
--- a/test/invalid_file_test.cc
+++ b/test/invalid_file_test.cc
@@ -204,7 +204,6 @@ const DecodeParam kMultiThreadedVP9InvalidFileTests[] = {
   { 2, "invalid-vp90-2-09-aq2.webm.ivf.s3984_r01-05_b6-.v2.ivf" },
   { 4, "invalid-vp90-2-09-subpixel-00.ivf.s19552_r01-05_b6-.v2.ivf" },
   { 2, "invalid-crbug-629481.webm" },
-  { 3, "invalid-crbug-1558.ivf" },
 };
 
 INSTANTIATE_TEST_CASE_P(
diff --git a/test/predict_test.cc b/test/predict_test.cc
index f6b4df07e..a4fcd352f 100644
--- a/test/predict_test.cc
+++ b/test/predict_test.cc
@@ -24,8 +24,8 @@
 
 namespace {
 
-using ::testing::make_tuple;
 using libvpx_test::ACMRandom;
+using ::testing::make_tuple;
 
 typedef void (*PredictFunc)(uint8_t *src_ptr, int src_pixels_per_line,
                             int xoffset, int yoffset, uint8_t *dst_ptr,
diff --git a/test/quantize_test.cc b/test/quantize_test.cc
index f470cc699..e06241ab8 100644
--- a/test/quantize_test.cc
+++ b/test/quantize_test.cc
@@ -35,8 +35,8 @@ typedef void (*VP8Quantize)(BLOCK *b, BLOCKD *d);
 
 typedef ::testing::tuple<VP8Quantize, VP8Quantize> VP8QuantizeParam;
 
-using ::testing::make_tuple;
 using libvpx_test::ACMRandom;
+using ::testing::make_tuple;
 
 // Create and populate a VP8_COMP instance which has a complete set of
 // quantization inputs as well as a second MACROBLOCKD for output.
diff --git a/test/test-data.mk b/test/test-data.mk
index 0aa881162..83ce7b942 100644
--- a/test/test-data.mk
+++ b/test/test-data.mk
@@ -787,8 +787,6 @@ LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-07-frame_parallel-2.web
 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-07-frame_parallel-3.webm
 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-crbug-629481.webm
 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-crbug-629481.webm.res
-LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-crbug-1558.ivf
-LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-crbug-1558.ivf.res
 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-crbug-667044.webm
 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-crbug-667044.webm.res
 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += crbug-1539.rawfile
diff --git a/test/test-data.sha1 b/test/test-data.sha1
index a799c4971..839aa802b 100644
--- a/test/test-data.sha1
+++ b/test/test-data.sha1
@@ -859,5 +859,3 @@ e2f9e1e47a791b4e939a9bdc50bf7a25b3761f77 *vp90-2-22-svc_1280x720_1.webm.md5
 a0fbbbc5dd50fd452096f4455a58c1a8c9f66697 *invalid-vp80-00-comprehensive-s17661_r01-05_b6-.ivf
 a61774cf03fc584bd9f0904fc145253bb8ea6c4c *invalid-vp80-00-comprehensive-s17661_r01-05_b6-.ivf.res
 894fae3afee0290546590823974203ab4b8abd95 *crbug-1539.rawfile
-f1026c03efd5da21b381c8eb21f0d64e6d7e4ba3 *invalid-crbug-1558.ivf
-eb198c25f861c3fe2cbd310de11eb96843019345 *invalid-crbug-1558.ivf.res