Index: webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc |
diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc b/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc |
index 50909ebd01cb1601bcc360969d23363fe09e904e..c72ae71ce48905e0cd0807939685eabd3dd21a83 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc |
+++ b/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc |
@@ -195,7 +195,7 @@ TEST_F(OveruseDetectorTest, SimpleOveruse2000Kbit30fps) { |
EXPECT_EQ(0, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(8, frames_until_overuse); |
+ EXPECT_EQ(5, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, SimpleOveruse100kbit10fps) { |
@@ -210,7 +210,7 @@ TEST_F(OveruseDetectorTest, SimpleOveruse100kbit10fps) { |
EXPECT_EQ(0, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(6, frames_until_overuse); |
+ EXPECT_EQ(5, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, DISABLED_OveruseWithHighVariance100Kbit10fps) { |
@@ -302,7 +302,7 @@ TEST_F(OveruseDetectorTest, OveruseWithLowVariance2000Kbit30fps) { |
} |
// Simulate a higher send pace, that is too high. |
// Total build up of 30 ms. |
- for (int j = 0; j < 5; ++j) { |
+ for (int j = 0; j < 3; ++j) { |
UpdateDetector(rtp_timestamp, now_ms_, packet_size); |
UpdateDetector(rtp_timestamp, now_ms_, packet_size); |
UpdateDetector(rtp_timestamp, now_ms_, packet_size); |
@@ -331,10 +331,10 @@ TEST_F(OveruseDetectorTest, MAYBE_LowGaussianVariance30Kbit3fps) { |
int sigma_ms = 3; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(1, unique_overuse); |
+ EXPECT_EQ(56, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(13, frames_until_overuse); |
+ EXPECT_EQ(430, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, LowGaussianVarianceFastDrift30Kbit3fps) { |
@@ -345,7 +345,7 @@ TEST_F(OveruseDetectorTest, LowGaussianVarianceFastDrift30Kbit3fps) { |
int sigma_ms = 3; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(1, unique_overuse); |
+ EXPECT_EQ(56, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
EXPECT_EQ(4, frames_until_overuse); |
@@ -359,10 +359,10 @@ TEST_F(OveruseDetectorTest, HighGaussianVariance30Kbit3fps) { |
int sigma_ms = 10; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(1, unique_overuse); |
+ EXPECT_EQ(77, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(32, frames_until_overuse); |
+ EXPECT_EQ(430, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, HighGaussianVarianceFastDrift30Kbit3fps) { |
@@ -373,7 +373,7 @@ TEST_F(OveruseDetectorTest, HighGaussianVarianceFastDrift30Kbit3fps) { |
int sigma_ms = 10; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(1, unique_overuse); |
+ EXPECT_EQ(77, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
EXPECT_EQ(4, frames_until_overuse); |
@@ -393,10 +393,10 @@ TEST_F(OveruseDetectorTest, MAYBE_LowGaussianVariance100Kbit5fps) { |
int sigma_ms = 3; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(45, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(13, frames_until_overuse); |
+ EXPECT_EQ(32, frames_until_overuse); |
} |
#if defined(WEBRTC_ANDROID) |
@@ -413,7 +413,7 @@ TEST_F(OveruseDetectorTest, MAYBE_HighGaussianVariance100Kbit5fps) { |
int sigma_ms = 10; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(1, unique_overuse); |
+ EXPECT_EQ(70, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
EXPECT_EQ(32, frames_until_overuse); |
@@ -433,7 +433,7 @@ TEST_F(OveruseDetectorTest, MAYBE_LowGaussianVariance100Kbit10fps) { |
int sigma_ms = 3; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(1, unique_overuse); |
+ EXPECT_EQ(33, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
EXPECT_EQ(13, frames_until_overuse); |
@@ -453,10 +453,10 @@ TEST_F(OveruseDetectorTest, MAYBE_HighGaussianVariance100Kbit10fps) { |
int sigma_ms = 10; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(45, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(32, frames_until_overuse); |
+ EXPECT_EQ(31, frames_until_overuse); |
} |
#if defined(WEBRTC_ANDROID) |
@@ -473,10 +473,10 @@ TEST_F(OveruseDetectorTest, MAYBE_LowGaussianVariance300Kbit30fps) { |
int sigma_ms = 3; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(25, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(15, frames_until_overuse); |
+ EXPECT_EQ(13, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, LowGaussianVarianceFastDrift300Kbit30fps) { |
@@ -487,10 +487,10 @@ TEST_F(OveruseDetectorTest, LowGaussianVarianceFastDrift300Kbit30fps) { |
int sigma_ms = 3; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(25, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(6, frames_until_overuse); |
+ EXPECT_EQ(4, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, HighGaussianVariance300Kbit30fps) { |
@@ -501,10 +501,10 @@ TEST_F(OveruseDetectorTest, HighGaussianVariance300Kbit30fps) { |
int sigma_ms = 10; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(46, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(41, frames_until_overuse); |
+ EXPECT_EQ(31, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, HighGaussianVarianceFastDrift300Kbit30fps) { |
@@ -515,10 +515,10 @@ TEST_F(OveruseDetectorTest, HighGaussianVarianceFastDrift300Kbit30fps) { |
int sigma_ms = 10; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(46, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(10, frames_until_overuse); |
+ EXPECT_EQ(6, frames_until_overuse); |
} |
#if defined(WEBRTC_ANDROID) |
@@ -535,10 +535,10 @@ TEST_F(OveruseDetectorTest, MAYBE_LowGaussianVariance1000Kbit30fps) { |
int sigma_ms = 3; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(25, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(15, frames_until_overuse); |
+ EXPECT_EQ(13, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, LowGaussianVarianceFastDrift1000Kbit30fps) { |
@@ -549,10 +549,10 @@ TEST_F(OveruseDetectorTest, LowGaussianVarianceFastDrift1000Kbit30fps) { |
int sigma_ms = 3; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(25, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(6, frames_until_overuse); |
+ EXPECT_EQ(4, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, HighGaussianVariance1000Kbit30fps) { |
@@ -563,10 +563,10 @@ TEST_F(OveruseDetectorTest, HighGaussianVariance1000Kbit30fps) { |
int sigma_ms = 10; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(45, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(41, frames_until_overuse); |
+ EXPECT_EQ(31, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, HighGaussianVarianceFastDrift1000Kbit30fps) { |
@@ -577,10 +577,10 @@ TEST_F(OveruseDetectorTest, HighGaussianVarianceFastDrift1000Kbit30fps) { |
int sigma_ms = 10; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(45, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(10, frames_until_overuse); |
+ EXPECT_EQ(6, frames_until_overuse); |
} |
#if defined(WEBRTC_ANDROID) |
@@ -597,10 +597,10 @@ TEST_F(OveruseDetectorTest, MAYBE_LowGaussianVariance2000Kbit30fps) { |
int sigma_ms = 3; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(25, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(15, frames_until_overuse); |
+ EXPECT_EQ(13, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, LowGaussianVarianceFastDrift2000Kbit30fps) { |
@@ -611,10 +611,10 @@ TEST_F(OveruseDetectorTest, LowGaussianVarianceFastDrift2000Kbit30fps) { |
int sigma_ms = 3; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(25, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(6, frames_until_overuse); |
+ EXPECT_EQ(4, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, HighGaussianVariance2000Kbit30fps) { |
@@ -625,10 +625,10 @@ TEST_F(OveruseDetectorTest, HighGaussianVariance2000Kbit30fps) { |
int sigma_ms = 10; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(45, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(41, frames_until_overuse); |
+ EXPECT_EQ(31, frames_until_overuse); |
} |
TEST_F(OveruseDetectorTest, HighGaussianVarianceFastDrift2000Kbit30fps) { |
@@ -639,10 +639,10 @@ TEST_F(OveruseDetectorTest, HighGaussianVarianceFastDrift2000Kbit30fps) { |
int sigma_ms = 10; |
int unique_overuse = Run100000Samples(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms); |
- EXPECT_EQ(0, unique_overuse); |
+ EXPECT_EQ(45, unique_overuse); |
int frames_until_overuse = RunUntilOveruse(packets_per_frame, packet_size, |
frame_duration_ms, sigma_ms, drift_per_frame_ms); |
- EXPECT_EQ(10, frames_until_overuse); |
+ EXPECT_EQ(6, frames_until_overuse); |
} |
class OveruseDetectorExperimentTest : public OveruseDetectorTest { |