ref: b7e03724b3afb83d8bb7e19bbf0fc8ccdcc1b3b6
parent: 94fb57d3a53861ec39b0a09ce36d551cb8157133
parent: 65e0663f06ddb6849f9e502bbcea325f515d5e47
author: Debargha Mukherjee <debargha@google.com>
date: Fri Dec 6 21:10:33 EST 2019
Merge "Merge Timestamp TestVpxRollover tests for Vp8/Vp9"
--- a/test/timestamp_test.cc
+++ b/test/timestamp_test.cc
@@ -75,8 +75,6 @@
}
};
-class TimestampTestVp9Only : public TimestampTest {};
-
// Tests encoding in millisecond timebase.
TEST_P(TimestampTest, EncodeFrames) {
DummyTimebaseVideoSource video(1, 1000);
@@ -90,9 +88,7 @@
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
}
-// TODO(webm:701): Enable VP8 test when the overflow issue in
-// TestVpxRollover is fixed.
-TEST_P(TimestampTestVp9Only, TestVpxRollover) {
+TEST_P(TimestampTest, TestVpxRollover) {
DummyTimebaseVideoSource video(1, 1000);
video.set_starting_pts(922337170351ll);
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
@@ -100,10 +96,6 @@
VP8_INSTANTIATE_TEST_CASE(TimestampTest,
::testing::Values(::libvpx_test::kTwoPassGood));
-VP8_INSTANTIATE_TEST_CASE(TimestampTestVp9Only,
- ::testing::Values(::libvpx_test::kTwoPassGood));
VP9_INSTANTIATE_TEST_CASE(TimestampTest,
- ::testing::Values(::libvpx_test::kTwoPassGood));
-VP9_INSTANTIATE_TEST_CASE(TimestampTestVp9Only,
::testing::Values(::libvpx_test::kTwoPassGood));
} // namespace