Merge "frame_size_tests: reduce 'large' size for win32"

diff --git a/test/frame_size_tests.cc b/test/frame_size_tests.cc
index 2400c2021b9f84a9451628a31d9b70e2ff46cec8..db27975a8f73511d0addb9b2f164f04db17ad622 100644 (file)
--- 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));