Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc |
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc |
index 6f8696a440fa2d9a77aa006a027128b26c44b6e1..611a18d9079dc88771be38d6dbadddd9892b2be8 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc |
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc |
@@ -90,7 +90,7 @@ TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, TestProcessAfterTimeout) { |
// RemoteBitrateEstimator. |
const int64_t kStreamTimeOutMs = 2000; |
const int64_t kProcessIntervalMs = 1000; |
- IncomingPacket(0, 1000, clock_.TimeInMilliseconds(), 0, 0, true); |
+ IncomingPacket(0, 1000, clock_.TimeInMilliseconds(), 0, 0); |
clock_.AdvanceTimeMilliseconds(kStreamTimeOutMs + 1); |
// Trigger timeout. |
bitrate_estimator_->Process(); |
@@ -106,16 +106,14 @@ TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, TestProbeDetection) { |
for (int i = 0; i < kProbeLength; ++i) { |
clock_.AdvanceTimeMilliseconds(10); |
now_ms = clock_.TimeInMilliseconds(); |
- IncomingPacket(0, 1000, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000), |
- true); |
+ IncomingPacket(0, 1000, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000)); |
} |
// Second burst sent at 8 * 1000 / 5 = 1600 kbps. |
for (int i = 0; i < kProbeLength; ++i) { |
clock_.AdvanceTimeMilliseconds(5); |
now_ms = clock_.TimeInMilliseconds(); |
- IncomingPacket(0, 1000, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000), |
- true); |
+ IncomingPacket(0, 1000, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000)); |
} |
bitrate_estimator_->Process(); |
@@ -132,12 +130,10 @@ TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, |
for (int i = 0; i < kProbeLength; ++i) { |
clock_.AdvanceTimeMilliseconds(5); |
now_ms = clock_.TimeInMilliseconds(); |
- IncomingPacket(0, 1000, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000), |
- true); |
+ IncomingPacket(0, 1000, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000)); |
// Non-paced packet, arriving 5 ms after. |
clock_.AdvanceTimeMilliseconds(5); |
- IncomingPacket(0, 100, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000), |
- false); |
+ IncomingPacket(0, 100, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000)); |
} |
bitrate_estimator_->Process(); |
@@ -158,7 +154,7 @@ TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, |
now_ms = clock_.TimeInMilliseconds(); |
send_time_ms += 10; |
IncomingPacket(0, 1000, now_ms, 90 * send_time_ms, |
- AbsSendTime(send_time_ms, 1000), true); |
+ AbsSendTime(send_time_ms, 1000)); |
} |
// Second burst sent at 8 * 1000 / 5 = 1600 kbps, arriving at 8 * 1000 / 8 = |
@@ -168,7 +164,7 @@ TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, |
now_ms = clock_.TimeInMilliseconds(); |
send_time_ms += 5; |
IncomingPacket(0, 1000, now_ms, send_time_ms, |
- AbsSendTime(send_time_ms, 1000), true); |
+ AbsSendTime(send_time_ms, 1000)); |
} |
bitrate_estimator_->Process(); |
@@ -188,7 +184,7 @@ TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, |
send_time_ms += 10; |
now_ms = clock_.TimeInMilliseconds(); |
IncomingPacket(0, 1000, now_ms, 90 * send_time_ms, |
- AbsSendTime(send_time_ms, 1000), true); |
+ AbsSendTime(send_time_ms, 1000)); |
} |
bitrate_estimator_->Process(); |
@@ -207,7 +203,7 @@ TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, TestProbeDetectionFasterArrival) { |
send_time_ms += 10; |
now_ms = clock_.TimeInMilliseconds(); |
IncomingPacket(0, 1000, now_ms, 90 * send_time_ms, |
- AbsSendTime(send_time_ms, 1000), true); |
+ AbsSendTime(send_time_ms, 1000)); |
} |
bitrate_estimator_->Process(); |
@@ -225,7 +221,7 @@ TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, TestProbeDetectionSlowerArrival) { |
send_time_ms += 5; |
now_ms = clock_.TimeInMilliseconds(); |
IncomingPacket(0, 1000, now_ms, 90 * send_time_ms, |
- AbsSendTime(send_time_ms, 1000), true); |
+ AbsSendTime(send_time_ms, 1000)); |
} |
bitrate_estimator_->Process(); |
@@ -245,7 +241,7 @@ TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, |
send_time_ms += 1; |
now_ms = clock_.TimeInMilliseconds(); |
IncomingPacket(0, 1000, now_ms, 90 * send_time_ms, |
- AbsSendTime(send_time_ms, 1000), true); |
+ AbsSendTime(send_time_ms, 1000)); |
} |
bitrate_estimator_->Process(); |
@@ -261,8 +257,7 @@ TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, ProbingIgnoresSmallPackets) { |
for (int i = 0; i < kProbeLength; ++i) { |
clock_.AdvanceTimeMilliseconds(10); |
now_ms = clock_.TimeInMilliseconds(); |
- IncomingPacket(0, 200, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000), |
- true); |
+ IncomingPacket(0, 200, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000)); |
} |
bitrate_estimator_->Process(); |
@@ -273,8 +268,7 @@ TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, ProbingIgnoresSmallPackets) { |
for (int i = 0; i < kProbeLength; ++i) { |
clock_.AdvanceTimeMilliseconds(10); |
now_ms = clock_.TimeInMilliseconds(); |
- IncomingPacket(0, 1000, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000), |
- true); |
+ IncomingPacket(0, 1000, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000)); |
} |
// Wait long enough so that we can call Process again. |