summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-07-22 18:40:31 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-07-22 18:40:31 -0700
commit897116d5c8d9a6bf8b814407c72d2daa1c3082b1 (patch)
tree9343bf8a3190f16b6446319f7bbcba1ec737cf69
parenta9b30b381b183d21dbec863b4e095a3bc948793c (diff)
parent2528051f41161fbe092cb773d66fe07aac1c73b7 (diff)
downloadlibvpx-897116d5c8d9a6bf8b814407c72d2daa1c3082b1.tar
libvpx-897116d5c8d9a6bf8b814407c72d2daa1c3082b1.tar.gz
libvpx-897116d5c8d9a6bf8b814407c72d2daa1c3082b1.tar.bz2
libvpx-897116d5c8d9a6bf8b814407c72d2daa1c3082b1.zip
Merge "frame_size_tests: reduce default 'large' frame size"
-rw-r--r--test/frame_size_tests.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/frame_size_tests.cc b/test/frame_size_tests.cc
index d1ea0967f..b05d12e9e 100644
--- a/test/frame_size_tests.cc
+++ b/test/frame_size_tests.cc
@@ -89,7 +89,8 @@ 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.
- video.SetSize(4096, 4096);
+ // TODO(jzern): restore this to at least 4096x4096 after issue #828 is fixed.
+ video.SetSize(4096, 2160);
video.set_limit(2);
expected_res_ = VPX_CODEC_OK;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));