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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
161 event_log, | 161 event_log, |
162 packet_router, | 162 packet_router, |
163 std::unique_ptr<PacedSender>(new PacedSender(clock, packet_router))) { | 163 std::unique_ptr<PacedSender>(new PacedSender(clock, packet_router))) { |
164 } | 164 } |
165 | 165 |
166 CongestionController::CongestionController( | 166 CongestionController::CongestionController( |
167 Clock* clock, | 167 Clock* clock, |
168 Observer* observer, | 168 Observer* observer, |
169 RemoteBitrateObserver* remote_bitrate_observer, | 169 RemoteBitrateObserver* remote_bitrate_observer, |
170 RtcEventLog* event_log) | 170 RtcEventLog* event_log) |
171 : CongestionController(clock, observer, remote_bitrate_observer, event_log, | 171 : CongestionController(clock, |
172 observer, | |
173 remote_bitrate_observer, | |
174 event_log, | |
kwiberg-webrtc
2016/12/03 00:30:57
Is this just a reformatting? Remove it, in that ca
minyue-webrtc
2016/12/06 09:04:19
oh, true. This CL was upstreamed on another branch
| |
172 new PacketRouter()) { | 175 new PacketRouter()) { |
173 // Record ownership. | 176 // Record ownership. |
174 owned_packet_router_.reset(packet_router_); | 177 owned_packet_router_.reset(packet_router_); |
175 } | 178 } |
176 | 179 |
177 CongestionController::CongestionController( | 180 CongestionController::CongestionController( |
178 Clock* clock, | 181 Clock* clock, |
179 Observer* observer, | 182 Observer* observer, |
180 RemoteBitrateObserver* remote_bitrate_observer, | 183 RemoteBitrateObserver* remote_bitrate_observer, |
181 RtcEventLog* event_log, | 184 RtcEventLog* event_log, |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
371 bool CongestionController::IsSendQueueFull() const { | 374 bool CongestionController::IsSendQueueFull() const { |
372 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; | 375 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; |
373 } | 376 } |
374 | 377 |
375 bool CongestionController::IsNetworkDown() const { | 378 bool CongestionController::IsNetworkDown() const { |
376 rtc::CritScope cs(&critsect_); | 379 rtc::CritScope cs(&critsect_); |
377 return network_state_ == kNetworkDown; | 380 return network_state_ == kNetworkDown; |
378 } | 381 } |
379 | 382 |
380 } // namespace webrtc | 383 } // namespace webrtc |
OLD | NEW |