Merge "Re-enable datarate tests for speeds 5 and 6."

This commit is contained in:
James Zern 2014-04-04 15:04:48 -07:00 committed by Gerrit Code Review
commit 19d5fb99bc

View File

@ -570,9 +570,9 @@ TEST_P(DatarateTestVP9Large, BasicRateTargeting3TemporalLayersFrameDropping) {
<< " The datarate for the file is greater than target by too much, "
"for layer: " << j;
// Expect some frame drops in this test: for this 200 frames test,
// expect at least 10% and not more than 50% drops.
// expect at least 10% and not more than 60% drops.
ASSERT_GE(num_drops_, 20);
ASSERT_LE(num_drops_, 100);
ASSERT_LE(num_drops_, 120);
}
}
@ -580,8 +580,5 @@ VP8_INSTANTIATE_TEST_CASE(DatarateTestLarge, ALL_TEST_MODES);
VP9_INSTANTIATE_TEST_CASE(DatarateTestVP9Large,
::testing::Values(::libvpx_test::kOnePassGood,
::libvpx_test::kRealTime),
::testing::Range(2, 5));
// TODO(marpan): Speed 5 to 7 fails on one of these tests, for
// real-time mode. So for now test up to speed 4, and start at 2
// (since speed 0 and 1 are slow). Enable more speeds when issue is fixed.
::testing::Range(2, 7));
} // namespace