OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 } | 150 } |
151 | 151 |
152 uint32_t VideoSender::TargetBitrateKbps() { | 152 uint32_t VideoSender::TargetBitrateKbps() { |
153 return (source_->bits_per_second() + 500) / 1000; | 153 return (source_->bits_per_second() + 500) / 1000; |
154 } | 154 } |
155 | 155 |
156 PacedVideoSender::PacedVideoSender(PacketProcessorListener* listener, | 156 PacedVideoSender::PacedVideoSender(PacketProcessorListener* listener, |
157 VideoSource* source, | 157 VideoSource* source, |
158 BandwidthEstimatorType estimator) | 158 BandwidthEstimatorType estimator) |
159 : VideoSender(listener, source, estimator), | 159 : VideoSender(listener, source, estimator), |
160 pacer_(&clock_, | 160 pacer_(&clock_, this) { |
161 this, | |
162 source->bits_per_second() / 1000, | |
163 PacedSender::kDefaultPaceMultiplier * source->bits_per_second() / | |
164 1000, | |
165 0) { | |
166 modules_.push_back(&pacer_); | 161 modules_.push_back(&pacer_); |
| 162 pacer_.SetEstimatedBitrate(source->bits_per_second()); |
167 } | 163 } |
168 | 164 |
169 PacedVideoSender::~PacedVideoSender() { | 165 PacedVideoSender::~PacedVideoSender() { |
170 for (Packet* packet : pacer_queue_) | 166 for (Packet* packet : pacer_queue_) |
171 delete packet; | 167 delete packet; |
172 for (Packet* packet : queue_) | 168 for (Packet* packet : queue_) |
173 delete packet; | 169 delete packet; |
174 } | 170 } |
175 | 171 |
176 void PacedVideoSender::RunFor(int64_t time_ms, Packets* in_out) { | 172 void PacedVideoSender::RunFor(int64_t time_ms, Packets* in_out) { |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
303 } | 299 } |
304 | 300 |
305 size_t PacedVideoSender::TimeToSendPadding(size_t bytes) { | 301 size_t PacedVideoSender::TimeToSendPadding(size_t bytes) { |
306 return 0; | 302 return 0; |
307 } | 303 } |
308 | 304 |
309 void PacedVideoSender::OnNetworkChanged(uint32_t target_bitrate_bps, | 305 void PacedVideoSender::OnNetworkChanged(uint32_t target_bitrate_bps, |
310 uint8_t fraction_lost, | 306 uint8_t fraction_lost, |
311 int64_t rtt) { | 307 int64_t rtt) { |
312 VideoSender::OnNetworkChanged(target_bitrate_bps, fraction_lost, rtt); | 308 VideoSender::OnNetworkChanged(target_bitrate_bps, fraction_lost, rtt); |
313 pacer_.UpdateBitrate( | 309 pacer_.SetEstimatedBitrate(target_bitrate_bps); |
314 target_bitrate_bps / 1000, | |
315 PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000, 0); | |
316 } | 310 } |
317 | 311 |
318 const int kNoLimit = std::numeric_limits<int>::max(); | 312 const int kNoLimit = std::numeric_limits<int>::max(); |
319 const int kPacketSizeBytes = 1200; | 313 const int kPacketSizeBytes = 1200; |
320 | 314 |
321 TcpSender::TcpSender(PacketProcessorListener* listener, | 315 TcpSender::TcpSender(PacketProcessorListener* listener, |
322 int flow_id, | 316 int flow_id, |
323 int64_t offset_ms) | 317 int64_t offset_ms) |
324 : TcpSender(listener, flow_id, offset_ms, kNoLimit) { | 318 : TcpSender(listener, flow_id, offset_ms, kNoLimit) { |
325 } | 319 } |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 RecordBitrate(); | 479 RecordBitrate(); |
486 } | 480 } |
487 | 481 |
488 uint32_t TcpSender::TargetBitrateKbps() { | 482 uint32_t TcpSender::TargetBitrateKbps() { |
489 return bitrate_kbps_; | 483 return bitrate_kbps_; |
490 } | 484 } |
491 | 485 |
492 } // namespace bwe | 486 } // namespace bwe |
493 } // namespace testing | 487 } // namespace testing |
494 } // namespace webrtc | 488 } // namespace webrtc |
OLD | NEW |