Merge "level tests: allow level undershoot"

This commit is contained in:
Hui Su 2017-07-05 20:47:20 +00:00 committed by Gerrit Code Review
commit 3e08a88854

View File

@ -73,7 +73,7 @@ TEST_P(LevelTest, TestTargetLevel11Large) {
target_level_ = 11; target_level_ = 11;
cfg_.rc_target_bitrate = 150; cfg_.rc_target_bitrate = 150;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
ASSERT_EQ(target_level_, level_); ASSERT_GE(target_level_, level_);
} }
TEST_P(LevelTest, TestTargetLevel20Large) { TEST_P(LevelTest, TestTargetLevel20Large) {
@ -83,7 +83,7 @@ TEST_P(LevelTest, TestTargetLevel20Large) {
target_level_ = 20; target_level_ = 20;
cfg_.rc_target_bitrate = 1200; cfg_.rc_target_bitrate = 1200;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
ASSERT_EQ(target_level_, level_); ASSERT_GE(target_level_, level_);
} }
TEST_P(LevelTest, TestTargetLevel31Large) { TEST_P(LevelTest, TestTargetLevel31Large) {
@ -93,7 +93,7 @@ TEST_P(LevelTest, TestTargetLevel31Large) {
target_level_ = 31; target_level_ = 31;
cfg_.rc_target_bitrate = 8000; cfg_.rc_target_bitrate = 8000;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
ASSERT_EQ(target_level_, level_); ASSERT_GE(target_level_, level_);
} }
// Test for keeping level stats only // Test for keeping level stats only
@ -103,11 +103,11 @@ TEST_P(LevelTest, TestTargetLevel0) {
target_level_ = 0; target_level_ = 0;
min_gf_internal_ = 4; min_gf_internal_ = 4;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
ASSERT_EQ(11, level_); ASSERT_GE(11, level_);
cfg_.rc_target_bitrate = 1600; cfg_.rc_target_bitrate = 1600;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
ASSERT_EQ(20, level_); ASSERT_GE(20, level_);
} }
// Test for level control being turned off // Test for level control being turned off