summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2021-11-06 10:42:46 -0700
committerJames Zern <jzern@google.com>2021-11-08 16:30:16 -0800
commit888bafc78d8bddb5cfc4262c93f456c812763571 (patch)
tree544f04c67d2f0ece00ac527697933dc1cc796480 /test
parent23796337ce5b0a2f58eb7386c9aded5e6a4b84f6 (diff)
downloadlibvpx-888bafc78d8bddb5cfc4262c93f456c812763571.tar
libvpx-888bafc78d8bddb5cfc4262c93f456c812763571.tar.gz
libvpx-888bafc78d8bddb5cfc4262c93f456c812763571.tar.bz2
libvpx-888bafc78d8bddb5cfc4262c93f456c812763571.zip
vp8 encoder: fix some integer overflows
cap the bitrate to 1000Mbps to avoid many instances of bitrate * 3 / 2 overflowing. this adds coverage for 2048x2048 in the default test for VP8 with TODOs for issues at that resolution for VP9 and at max resolution for both. Bug: b/189602769 Bug: chromium:1264506 Bug: webm:1748 Bug: webm:1749 Bug: webm:1750 Bug: webm:1751 Change-Id: Iedee4dd8d3609c2504271f94d22433dfcd828429
Diffstat (limited to 'test')
-rw-r--r--test/realtime_test.cc43
1 files changed, 38 insertions, 5 deletions
diff --git a/test/realtime_test.cc b/test/realtime_test.cc
index 63a5347d9..b32a35513 100644
--- a/test/realtime_test.cc
+++ b/test/realtime_test.cc
@@ -7,6 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <limits.h>
+
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/util.h"
@@ -52,6 +54,22 @@ class RealtimeTest
frame_packets_++;
}
+ bool IsVP9() const {
+#if CONFIG_VP9_ENCODER
+ return codec_ == &libvpx_test::kVP9;
+#else
+ return false;
+#endif
+ }
+
+ void TestIntegerOverflow(unsigned int width, unsigned int height) {
+ ::libvpx_test::RandomVideoSource video;
+ video.SetSize(width, height);
+ video.set_limit(20);
+ cfg_.rc_target_bitrate = UINT_MAX;
+ ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
+ }
+
int frame_packets_;
};
@@ -64,11 +82,26 @@ TEST_P(RealtimeTest, RealtimeFirstPassProducesFrames) {
}
TEST_P(RealtimeTest, IntegerOverflow) {
- ::libvpx_test::RandomVideoSource video;
- video.SetSize(800, 480);
- video.set_limit(20);
- cfg_.rc_target_bitrate = 140000000;
- ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
+ if (IsVP9()) {
+ // TODO(https://crbug.com/webm/1749): This should match VP8.
+ TestIntegerOverflow(800, 480);
+ } else {
+ TestIntegerOverflow(2048, 2048);
+ }
+}
+
+TEST_P(RealtimeTest, IntegerOverflowLarge) {
+ if (IsVP9()) {
+ GTEST_SKIP() << "TODO(https://crbug.com/webm/1750): Enable this test after "
+ "undefined sanitizer warnings are fixed.";
+ // TestIntegerOverflow(16384, 16384);
+ } else {
+ GTEST_SKIP()
+ << "TODO(https://crbug.com/webm/1748,https://crbug.com/webm/1751):"
+ << " Enable this test after bitstream errors & undefined sanitizer "
+ "warnings are fixed.";
+ // TestIntegerOverflow(16383, 16383);
+ }
}
VP8_INSTANTIATE_TEST_SUITE(RealtimeTest,