| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 | 93 |
| 94 int64_t time_now = clock_->TimeInMilliseconds(); | 94 int64_t time_now = clock_->TimeInMilliseconds(); |
| 95 | 95 |
| 96 // Delay introduced by the link capacity. | 96 // Delay introduced by the link capacity. |
| 97 int64_t capacity_delay_ms = 0; | 97 int64_t capacity_delay_ms = 0; |
| 98 if (config_.link_capacity_kbps > 0) | 98 if (config_.link_capacity_kbps > 0) |
| 99 capacity_delay_ms = data_length / (config_.link_capacity_kbps / 8); | 99 capacity_delay_ms = data_length / (config_.link_capacity_kbps / 8); |
| 100 int64_t network_start_time = time_now; | 100 int64_t network_start_time = time_now; |
| 101 | 101 |
| 102 // Check if there already are packets on the link and change network start | 102 // Check if there already are packets on the link and change network start |
| 103 // time if there is. | 103 // time forward if there is. |
| 104 if (!capacity_link_.empty()) | 104 if (!capacity_link_.empty() && |
| 105 network_start_time < capacity_link_.back()->arrival_time()) |
| 105 network_start_time = capacity_link_.back()->arrival_time(); | 106 network_start_time = capacity_link_.back()->arrival_time(); |
| 106 | 107 |
| 107 int64_t arrival_time = network_start_time + capacity_delay_ms; | 108 int64_t arrival_time = network_start_time + capacity_delay_ms; |
| 108 NetworkPacket* packet = new NetworkPacket(data, data_length, time_now, | 109 NetworkPacket* packet = new NetworkPacket(data, data_length, time_now, |
| 109 arrival_time); | 110 arrival_time); |
| 110 capacity_link_.push(packet); | 111 capacity_link_.push(packet); |
| 111 } | 112 } |
| 112 | 113 |
| 113 float FakeNetworkPipe::PercentageLoss() { | 114 float FakeNetworkPipe::PercentageLoss() { |
| 114 rtc::CritScope crit(&lock_); | 115 rtc::CritScope crit(&lock_); |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 int64_t FakeNetworkPipe::TimeUntilNextProcess() const { | 195 int64_t FakeNetworkPipe::TimeUntilNextProcess() const { |
| 195 rtc::CritScope crit(&lock_); | 196 rtc::CritScope crit(&lock_); |
| 196 const int64_t kDefaultProcessIntervalMs = 30; | 197 const int64_t kDefaultProcessIntervalMs = 30; |
| 197 if (capacity_link_.empty() || delay_link_.empty()) | 198 if (capacity_link_.empty() || delay_link_.empty()) |
| 198 return kDefaultProcessIntervalMs; | 199 return kDefaultProcessIntervalMs; |
| 199 return std::max<int64_t>(next_process_time_ - clock_->TimeInMilliseconds(), | 200 return std::max<int64_t>(next_process_time_ - clock_->TimeInMilliseconds(), |
| 200 0); | 201 0); |
| 201 } | 202 } |
| 202 | 203 |
| 203 } // namespace webrtc | 204 } // namespace webrtc |
| OLD | NEW |