Merge "vp9: Modify ChangingDropFrameThresh unittest."

This commit is contained in:
Marco Paniconi 2017-05-17 18:42:51 +00:00 committed by Gerrit Code Review
commit a2dfbbd7d6

View File

@ -792,6 +792,8 @@ TEST_P(DatarateTestVP9Large, ChangingDropFrameThresh) {
30, 1, 0, 140);
const int kDropFrameThreshTestStep = 30;
for (int j = 50; j <= 150; j += 100) {
cfg_.rc_target_bitrate = j;
vpx_codec_pts_t last_drop = 140;
int last_num_drops = 0;
for (int i = 10; i < 100; i += kDropFrameThreshTestStep) {
@ -800,7 +802,7 @@ TEST_P(DatarateTestVP9Large, ChangingDropFrameThresh) {
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
ASSERT_GE(effective_datarate_[0], cfg_.rc_target_bitrate * 0.85)
<< " The datarate for the file is lower than target by too much!";
ASSERT_LE(effective_datarate_[0], cfg_.rc_target_bitrate * 1.15)
ASSERT_LE(effective_datarate_[0], cfg_.rc_target_bitrate * 1.25)
<< " The datarate for the file is greater than target by too much!";
ASSERT_LE(first_drop_, last_drop)
<< " The first dropped frame for drop_thresh " << i
@ -814,6 +816,7 @@ TEST_P(DatarateTestVP9Large, ChangingDropFrameThresh) {
last_num_drops = num_drops_;
}
}
}
// Check basic rate targeting for 2 temporal layers.
TEST_P(DatarateTestVP9Large, BasicRateTargeting2TemporalLayers) {