diff options
| author | Debargha Mukherjee <debargha@google.com> | 2019-12-07 02:10:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-07 02:10:33 +0000 |
| commit | b7e03724b3afb83d8bb7e19bbf0fc8ccdcc1b3b6 (patch) | |
| tree | e5e05fe16532e5620fdbc92e8fa97e5ff2a48b7a | |
| parent | 94fb57d3a53861ec39b0a09ce36d551cb8157133 (diff) | |
| parent | 65e0663f06ddb6849f9e502bbcea325f515d5e47 (diff) | |
| download | libvpx-b7e03724b3afb83d8bb7e19bbf0fc8ccdcc1b3b6.tar.gz | |
Merge "Merge Timestamp TestVpxRollover tests for Vp8/Vp9"
| -rw-r--r-- | test/timestamp_test.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/test/timestamp_test.cc b/test/timestamp_test.cc index 021ea621f..41c192887 100644 --- a/test/timestamp_test.cc +++ b/test/timestamp_test.cc @@ -75,8 +75,6 @@ class TimestampTest } }; -class TimestampTestVp9Only : public TimestampTest {}; - // Tests encoding in millisecond timebase. TEST_P(TimestampTest, EncodeFrames) { DummyTimebaseVideoSource video(1, 1000); @@ -90,9 +88,7 @@ TEST_P(TimestampTest, TestMicrosecondTimebase) { 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 @@ TEST_P(TimestampTestVp9Only, TestVpxRollover) { 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 |