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 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 static const int kWindowMs = 500; | 238 static const int kWindowMs = 500; |
239 | 239 |
240 int target_rate_kbps_; | 240 int target_rate_kbps_; |
241 int bytes_remaining_; | 241 int bytes_remaining_; |
242 }; | 242 }; |
243 } // namespace paced_sender | 243 } // namespace paced_sender |
244 | 244 |
245 const int64_t PacedSender::kMaxQueueLengthMs = 2000; | 245 const int64_t PacedSender::kMaxQueueLengthMs = 2000; |
246 const float PacedSender::kDefaultPaceMultiplier = 2.5f; | 246 const float PacedSender::kDefaultPaceMultiplier = 2.5f; |
247 | 247 |
248 PacedSender::PacedSender(Clock* clock, PacketSender* packet_sender) | 248 PacedSender::PacedSender(Clock* clock, |
| 249 PacketSender* packet_sender, |
| 250 PacingObserver* pacing_observer) |
249 : clock_(clock), | 251 : clock_(clock), |
250 packet_sender_(packet_sender), | 252 packet_sender_(packet_sender), |
| 253 pacing_observer_(pacing_observer), |
251 critsect_(CriticalSectionWrapper::CreateCriticalSection()), | 254 critsect_(CriticalSectionWrapper::CreateCriticalSection()), |
252 paused_(false), | 255 paused_(false), |
253 media_budget_(new paced_sender::IntervalBudget(0)), | 256 media_budget_(new paced_sender::IntervalBudget(0)), |
254 padding_budget_(new paced_sender::IntervalBudget(0)), | 257 padding_budget_(new paced_sender::IntervalBudget(0)), |
255 prober_(new BitrateProber()), | 258 prober_(new BitrateProber()), |
256 estimated_bitrate_bps_(0), | 259 estimated_bitrate_bps_(0), |
257 min_send_bitrate_kbps_(0u), | 260 min_send_bitrate_kbps_(0u), |
258 max_padding_bitrate_kbps_(0u), | 261 max_padding_bitrate_kbps_(0u), |
259 pacing_bitrate_kbps_(0), | 262 pacing_bitrate_kbps_(0), |
260 time_last_update_us_(clock->TimeInMicroseconds()), | 263 time_last_update_us_(clock->TimeInMicroseconds()), |
261 packets_(new paced_sender::PacketQueue(clock)), | 264 packets_(new paced_sender::PacketQueue(clock)), |
262 packet_counter_(0) { | 265 packet_counter_(0) { |
263 UpdateBytesPerInterval(kMinPacketLimitMs); | 266 UpdateBudgetWithElapsedTime(kMinPacketLimitMs); |
264 } | 267 } |
265 | 268 |
266 PacedSender::~PacedSender() {} | 269 PacedSender::~PacedSender() {} |
267 | 270 |
268 void PacedSender::CreateProbeCluster(int bitrate_bps, int num_packets) { | 271 void PacedSender::CreateProbeCluster(int bitrate_bps, int num_packets) { |
269 CriticalSectionScoped cs(critsect_.get()); | 272 CriticalSectionScoped cs(critsect_.get()); |
270 prober_->CreateProbeCluster(bitrate_bps, num_packets); | 273 prober_->CreateProbeCluster(bitrate_bps, num_packets); |
271 } | 274 } |
272 | 275 |
273 void PacedSender::Pause() { | 276 void PacedSender::Pause() { |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
390 int64_t avg_time_left_ms = std::max<int64_t>( | 393 int64_t avg_time_left_ms = std::max<int64_t>( |
391 1, kMaxQueueLengthMs - packets_->AverageQueueTimeMs()); | 394 1, kMaxQueueLengthMs - packets_->AverageQueueTimeMs()); |
392 int min_bitrate_needed_kbps = | 395 int min_bitrate_needed_kbps = |
393 static_cast<int>(queue_size_bytes * 8 / avg_time_left_ms); | 396 static_cast<int>(queue_size_bytes * 8 / avg_time_left_ms); |
394 if (min_bitrate_needed_kbps > target_bitrate_kbps) | 397 if (min_bitrate_needed_kbps > target_bitrate_kbps) |
395 target_bitrate_kbps = min_bitrate_needed_kbps; | 398 target_bitrate_kbps = min_bitrate_needed_kbps; |
396 } | 399 } |
397 | 400 |
398 media_budget_->set_target_rate_kbps(target_bitrate_kbps); | 401 media_budget_->set_target_rate_kbps(target_bitrate_kbps); |
399 | 402 |
400 int64_t delta_time_ms = std::min(kMaxIntervalTimeMs, elapsed_time_ms); | 403 elapsed_time_ms = std::min(kMaxIntervalTimeMs, elapsed_time_ms); |
401 UpdateBytesPerInterval(delta_time_ms); | 404 UpdateBudgetWithElapsedTime(elapsed_time_ms); |
402 } | 405 } |
403 | 406 |
404 bool is_probing = prober_->IsProbing(); | 407 bool is_probing = prober_->IsProbing(); |
405 int probe_cluster_id = PacketInfo::kNotAProbe; | 408 int probe_cluster_id = PacketInfo::kNotAProbe; |
406 size_t bytes_sent = 0; | 409 size_t bytes_sent = 0; |
407 size_t recommended_probe_size = 0; | 410 size_t recommended_probe_size = 0; |
408 if (is_probing) { | 411 if (is_probing) { |
409 probe_cluster_id = prober_->CurrentClusterId(); | 412 probe_cluster_id = prober_->CurrentClusterId(); |
410 recommended_probe_size = prober_->RecommendedMinProbeSize(); | 413 recommended_probe_size = prober_->RecommendedMinProbeSize(); |
411 } | 414 } |
(...skipping 23 matching lines...) Expand all Loading... |
435 if (packet_counter_ > 0) { | 438 if (packet_counter_ > 0) { |
436 int padding_needed = is_probing ? (recommended_probe_size - bytes_sent) | 439 int padding_needed = is_probing ? (recommended_probe_size - bytes_sent) |
437 : padding_budget_->bytes_remaining(); | 440 : padding_budget_->bytes_remaining(); |
438 | 441 |
439 if (padding_needed > 0) | 442 if (padding_needed > 0) |
440 bytes_sent += SendPadding(padding_needed, probe_cluster_id); | 443 bytes_sent += SendPadding(padding_needed, probe_cluster_id); |
441 } | 444 } |
442 } | 445 } |
443 if (is_probing) | 446 if (is_probing) |
444 prober_->ProbeSent(clock_->TimeInMilliseconds(), bytes_sent); | 447 prober_->ProbeSent(clock_->TimeInMilliseconds(), bytes_sent); |
| 448 pacing_observer_->OnBytesSent(bytes_sent, elapsed_time_ms); |
445 } | 449 } |
446 | 450 |
447 bool PacedSender::SendPacket(const paced_sender::Packet& packet, | 451 bool PacedSender::SendPacket(const paced_sender::Packet& packet, |
448 int probe_cluster_id) { | 452 int probe_cluster_id) { |
449 // TODO(holmer): Because of this bug issue 5307 we have to send audio | 453 // TODO(holmer): Because of this bug issue 5307 we have to send audio |
450 // packets even when the pacer is paused. Here we assume audio packets are | 454 // packets even when the pacer is paused. Here we assume audio packets are |
451 // always high priority and that they are the only high priority packets. | 455 // always high priority and that they are the only high priority packets. |
452 if (packet.priority != kHighPriority) { | 456 if (packet.priority != kHighPriority) { |
453 if (paused_) | 457 if (paused_) |
454 return false; | 458 return false; |
455 if (media_budget_->bytes_remaining() == 0 && | 459 if (media_budget_->bytes_remaining() == 0 && |
456 probe_cluster_id == PacketInfo::kNotAProbe) { | 460 probe_cluster_id == PacketInfo::kNotAProbe) { |
457 return false; | 461 return false; |
458 } | 462 } |
459 } | 463 } |
460 critsect_->Leave(); | 464 critsect_->Leave(); |
461 const bool success = packet_sender_->TimeToSendPacket( | 465 const bool success = packet_sender_->TimeToSendPacket( |
462 packet.ssrc, packet.sequence_number, packet.capture_time_ms, | 466 packet.ssrc, packet.sequence_number, packet.capture_time_ms, |
463 packet.retransmission, probe_cluster_id); | 467 packet.retransmission, probe_cluster_id); |
464 critsect_->Enter(); | 468 critsect_->Enter(); |
465 | 469 |
466 if (success) { | 470 if (success) { |
467 // TODO(holmer): High priority packets should only be accounted for if we | 471 // TODO(holmer): High priority packets should only be accounted for if we |
468 // are allocating bandwidth for audio. | 472 // are allocating bandwidth for audio. |
469 if (packet.priority != kHighPriority) { | 473 if (packet.priority != kHighPriority) { |
470 // Update media bytes sent. | 474 // Update media bytes sent. |
471 media_budget_->UseBudget(packet.bytes); | 475 UpdateBudgetWithBytesSent(packet.bytes); |
472 padding_budget_->UseBudget(packet.bytes); | |
473 } | 476 } |
474 } | 477 } |
475 | 478 |
476 return success; | 479 return success; |
477 } | 480 } |
478 | 481 |
479 size_t PacedSender::SendPadding(size_t padding_needed, int probe_cluster_id) { | 482 size_t PacedSender::SendPadding(size_t padding_needed, int probe_cluster_id) { |
480 critsect_->Leave(); | 483 critsect_->Leave(); |
481 size_t bytes_sent = | 484 size_t bytes_sent = |
482 packet_sender_->TimeToSendPadding(padding_needed, probe_cluster_id); | 485 packet_sender_->TimeToSendPadding(padding_needed, probe_cluster_id); |
483 critsect_->Enter(); | 486 critsect_->Enter(); |
484 | 487 |
485 if (bytes_sent > 0) { | 488 if (bytes_sent > 0) { |
486 media_budget_->UseBudget(bytes_sent); | 489 UpdateBudgetWithBytesSent(bytes_sent); |
487 padding_budget_->UseBudget(bytes_sent); | |
488 } | 490 } |
489 return bytes_sent; | 491 return bytes_sent; |
490 } | 492 } |
491 | 493 |
492 void PacedSender::UpdateBytesPerInterval(int64_t delta_time_ms) { | 494 void PacedSender::UpdateBudgetWithElapsedTime(int64_t delta_time_ms) { |
493 media_budget_->IncreaseBudget(delta_time_ms); | 495 media_budget_->IncreaseBudget(delta_time_ms); |
494 padding_budget_->IncreaseBudget(delta_time_ms); | 496 padding_budget_->IncreaseBudget(delta_time_ms); |
495 } | 497 } |
| 498 |
| 499 void PacedSender::UpdateBudgetWithBytesSent(size_t bytes_sent) { |
| 500 media_budget_->UseBudget(bytes_sent); |
| 501 padding_budget_->UseBudget(bytes_sent); |
| 502 } |
496 } // namespace webrtc | 503 } // namespace webrtc |
OLD | NEW |