Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc |
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc |
index 044e43424b98c82a83c2aa20d65c497f953a2db6..610d68aa26f80d2df764006686c5a8ad4d84ecd6 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc |
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc |
@@ -348,27 +348,51 @@ TEST_P(BweFeedbackTest, GoogleWifiTrace3Mbps) { |
} |
TEST_P(BweFeedbackTest, PacedSelfFairness50msTest) { |
- RunFairnessTest(GetParam(), 4, 0, 300, 3000, 50); |
+ int64_t kRttMs = 100; |
+ int64_t kMaxJitterMs = 15; |
+ const int64_t kOffsetMs[] = {0, 5000, 10000, 15000}; |
stefan-webrtc
2015/07/21 12:12:32
Previously I think we had random offsets here. I s
magalhaesc
2015/07/21 14:46:53
Right, done.
|
+ RunFairnessTest(GetParam(), 4, 0, 300, 3000, 50, kRttMs, kMaxJitterMs, |
+ kOffsetMs); |
} |
TEST_P(BweFeedbackTest, PacedSelfFairness500msTest) { |
- RunFairnessTest(GetParam(), 4, 0, 300, 3000, 500); |
+ int64_t kRttMs = 100; |
+ int64_t kMaxJitterMs = 15; |
+ const int64_t kOffsetMs[] = {0, 5000, 10000, 15000}; |
+ RunFairnessTest(GetParam(), 4, 0, 300, 3000, 500, kRttMs, kMaxJitterMs, |
+ kOffsetMs); |
} |
TEST_P(BweFeedbackTest, PacedSelfFairness1000msTest) { |
- RunFairnessTest(GetParam(), 4, 0, 300, 3000, 1000); |
+ int64_t kRttMs = 100; |
+ int64_t kMaxJitterMs = 15; |
+ const int64_t kOffsetMs[] = {0, 5000, 10000, 15000}; |
+ RunFairnessTest(GetParam(), 4, 0, 300, 3000, 1000, kRttMs, kMaxJitterMs, |
+ kOffsetMs); |
} |
TEST_P(BweFeedbackTest, TcpFairness50msTest) { |
- RunFairnessTest(GetParam(), 1, 1, 300, 2000, 50); |
+ int64_t kRttMs = 100; |
+ int64_t kMaxJitterMs = 15; |
+ const int64_t kOffsetMs[] = {0, 10000}; |
+ RunFairnessTest(GetParam(), 1, 1, 300, 2000, 50, kRttMs, kMaxJitterMs, |
+ kOffsetMs); |
} |
TEST_P(BweFeedbackTest, TcpFairness500msTest) { |
- RunFairnessTest(GetParam(), 1, 1, 300, 2000, 500); |
+ int64_t kRttMs = 100; |
+ int64_t kMaxJitterMs = 15; |
+ const int64_t kOffsetMs[] = {0, 10000}; |
+ RunFairnessTest(GetParam(), 1, 1, 300, 2000, 500, kRttMs, kMaxJitterMs, |
+ kOffsetMs); |
} |
TEST_P(BweFeedbackTest, TcpFairness1000msTest) { |
- RunFairnessTest(GetParam(), 1, 1, 300, 2000, 1000); |
+ int64_t kRttMs = 100; |
+ int64_t kMaxJitterMs = 15; |
+ const int64_t kOffsetMs[] = {0, 10000}; |
+ RunFairnessTest(GetParam(), 1, 1, 300, 2000, 1000, kRttMs, kMaxJitterMs, |
+ kOffsetMs); |
} |
} // namespace bwe |
} // namespace testing |