summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-08-15 14:39:28 -0700
committerJames Zern <jzern@google.com>2014-08-15 14:43:53 -0700
commitd637c2b41fdd89b72cc10009c619c345d0776efa (patch)
tree3f18805f58bf53a21672a2de7529bf861731d193
parent45d12e0bd3ce067398f112041ac61d0bfe99b429 (diff)
downloadlibvpx-d637c2b41fdd89b72cc10009c619c345d0776efa.tar
libvpx-d637c2b41fdd89b72cc10009c619c345d0776efa.tar.gz
libvpx-d637c2b41fdd89b72cc10009c619c345d0776efa.tar.bz2
libvpx-d637c2b41fdd89b72cc10009c619c345d0776efa.zip
frame_size_tests: reduce 'large' size for win32
this test allocates >2GB currently. depending on the order of the test runs the allocation may fail most regularly with mingw+wine. Change-Id: Ibee1c18cfbe29a4de6c65075647ec3955d8206c0
-rw-r--r--test/frame_size_tests.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/frame_size_tests.cc b/test/frame_size_tests.cc
index 2400c2021..db27975a8 100644
--- a/test/frame_size_tests.cc
+++ b/test/frame_size_tests.cc
@@ -72,7 +72,13 @@ TEST_F(VP9FrameSizeTestsLarge, ValidSizes) {
// 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
+ // mingw + wine, use a smaller size in that case.
+#if defined(_WIN32) && !defined(_WIN64)
+ video.SetSize(4096, 3072);
+#else
video.SetSize(4096, 4096);
+#endif
video.set_limit(2);
expected_res_ = VPX_CODEC_OK;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));