commit 1b6e3948a71b5b436ce3b752ad01c75fc58d865d
author Yaowu Xu <yaowu@google.com> Wed May 03 17:56:33 2017 -0700
committer Yaowu Xu <yaowu@google.com> Thu May 04 02:35:57 2017 +0000
tree 423fee89011f78f0bc26924410bae1ac00dacb2c
parent 022dc4742125187ab0af40f9a619f83611a87593

Remove LargeValidSizes test

Unless configured with size_limit, since the regular 2K/4K size is
already being tested in MotionVectorTestlarge test.

Change-Id: If3b8cb579e1a50eff582d95022733c157a0fdf57

test/frame_size_tests.cc

diff --git a/test/frame_size_tests.cc b/test/frame_size_tests.cc
index 73cc9c0..d2e762f 100644
--- a/test/frame_size_tests.cc
+++ b/test/frame_size_tests.cc
@@ -46,43 +46,25 @@
   int expected_res_;
 };
 
+#if CONFIG_SIZE_LIMIT
 TEST_F(AV1FrameSizeTests, TestInvalidSizes) {
   ::libaom_test::RandomVideoSource video;
 
-#if CONFIG_SIZE_LIMIT
   video.SetSize(DECODE_WIDTH_LIMIT + 16, DECODE_HEIGHT_LIMIT + 16);
   video.set_limit(2);
   expected_res_ = AOM_CODEC_CORRUPT_FRAME;
   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
-#endif
 }
 
 TEST_F(AV1FrameSizeTests, LargeValidSizes) {
   ::libaom_test::RandomVideoSource video;
 
-#if CONFIG_SIZE_LIMIT
   video.SetSize(DECODE_WIDTH_LIMIT, DECODE_HEIGHT_LIMIT);
   video.set_limit(2);
   expected_res_ = AOM_CODEC_OK;
   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
-#else
-  // This test produces a pretty large single frame allocation,  (roughly
-  // 25 megabits). The encoder allocates a good number of these frames
-  // one for each lag in frames (for 2 pass), and then one for each possible
-  // reference buffer (8) - we can end up with up to 30 buffers of roughly this
-  // size or almost 1 gig of memory.
-  // In total the allocations will exceed 2GiB which may cause a failure with
-  // non-64 bit platforms, use a smaller size in that case.
-  if (sizeof(void *) < 8)
-    video.SetSize(2560, 1440);
-  else
-    video.SetSize(4096, 4096);
-
-  video.set_limit(2);
-  expected_res_ = AOM_CODEC_OK;
-  ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
-#endif
 }
+#endif
 
 TEST_F(AV1FrameSizeTests, OneByOneVideo) {
   ::libaom_test::RandomVideoSource video;