diff options
| author | Debargha Mukherjee <debargha@google.com> | 2019-12-06 14:20:56 -0800 |
|---|---|---|
| committer | Debargha Mukherjee <debargha@google.com> | 2019-12-06 15:52:25 -0800 |
| commit | 65e0663f06ddb6849f9e502bbcea325f515d5e47 (patch) | |
| tree | f15880a4f28e0ee2020be02bd22969091ea48d0d /test/timestamp_test.cc | |
| parent | f835ab76082e8ea2e04901f1b9746c65e56f4218 (diff) | |
| download | libvpx-65e0663f06ddb6849f9e502bbcea325f515d5e47.tar libvpx-65e0663f06ddb6849f9e502bbcea325f515d5e47.tar.gz libvpx-65e0663f06ddb6849f9e502bbcea325f515d5e47.tar.bz2 libvpx-65e0663f06ddb6849f9e502bbcea325f515d5e47.zip | |
Merge Timestamp TestVpxRollover tests for Vp8/Vp9
BUG=webm:701
Change-Id: Id0b928db3cbb6263d136d7b9eb8d9453b3c63824
Diffstat (limited to 'test/timestamp_test.cc')
| -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 |