| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 762 int64_t max_delay_ms = kMaxQueueingDelayMs; | 762 int64_t max_delay_ms = kMaxQueueingDelayMs; |
| 763 int64_t rtt_ms = 2 * kOneWayDelayMs; | 763 int64_t rtt_ms = 2 * kOneWayDelayMs; |
| 764 | 764 |
| 765 // Test also with one way propagation delay = 100ms. | 765 // Test also with one way propagation delay = 100ms. |
| 766 // rtt_ms = 2 * 100; | 766 // rtt_ms = 2 * 100; |
| 767 // Test also with bottleneck queue size = 20ms and 1000ms. | 767 // Test also with bottleneck queue size = 20ms and 1000ms. |
| 768 // max_delay_ms = 20; | 768 // max_delay_ms = 20; |
| 769 // max_delay_ms = 1000; | 769 // max_delay_ms = 1000; |
| 770 | 770 |
| 771 std::string title("5.6_Long_TCP_Fairness"); | 771 std::string title("5.6_Long_TCP_Fairness"); |
| 772 std::string flow_name(bwe_names[bwe_type] + 'x' + bwe_names[kTcpEstimator]); | 772 std::string flow_name = std::string() + |
| 773 bwe_names[bwe_type] + 'x' + bwe_names[kTcpEstimator]; |
| 773 | 774 |
| 774 RunFairnessTest(bwe_type, kNumRmcatFlows, kNumTcpFlows, kRunTimeS, | 775 RunFairnessTest(bwe_type, kNumRmcatFlows, kNumTcpFlows, kRunTimeS, |
| 775 kCapacityKbps, max_delay_ms, rtt_ms, kMaxJitterMs, kOffSetsMs, | 776 kCapacityKbps, max_delay_ms, rtt_ms, kMaxJitterMs, kOffSetsMs, |
| 776 title, flow_name); | 777 title, flow_name); |
| 777 } | 778 } |
| 778 | 779 |
| 779 // 5.7. RMCAT Flows competing with multiple short TCP Flows. | 780 // 5.7. RMCAT Flows competing with multiple short TCP Flows. |
| 780 void BweTest::RunMultipleShortTcpFairness( | 781 void BweTest::RunMultipleShortTcpFairness( |
| 781 BandwidthEstimatorType bwe_type, | 782 BandwidthEstimatorType bwe_type, |
| 782 std::vector<int> tcp_file_sizes_bytes, | 783 std::vector<int> tcp_file_sizes_bytes, |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 986 tcp_starting_times_ms.push_back( | 987 tcp_starting_times_ms.push_back( |
| 987 static_cast<int64_t>(random.Exponential(1.0f / kMeanMs))); | 988 static_cast<int64_t>(random.Exponential(1.0f / kMeanMs))); |
| 988 } | 989 } |
| 989 | 990 |
| 990 return tcp_starting_times_ms; | 991 return tcp_starting_times_ms; |
| 991 } | 992 } |
| 992 | 993 |
| 993 } // namespace bwe | 994 } // namespace bwe |
| 994 } // namespace testing | 995 } // namespace testing |
| 995 } // namespace webrtc | 996 } // namespace webrtc |
| OLD | NEW |