Chromium Code Reviews| Index: webrtc/modules/pacing/paced_sender.cc |
| diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc |
| index 7c842bff022e3de5842193536482500ee53f06ab..d5df4809741bafab86ee8b446c29f4ff424d692d 100644 |
| --- a/webrtc/modules/pacing/paced_sender.cc |
| +++ b/webrtc/modules/pacing/paced_sender.cc |
| @@ -361,8 +361,11 @@ int32_t PacedSender::Process() { |
| } |
| } |
| + if (!packets_->Empty()) |
|
stefan-webrtc
2015/09/10 11:40:33
No point in sending padding if we have media packe
|
| + return 0; |
| + |
| size_t padding_needed; |
| - if (prober_->IsProbing() && ProbingExperimentIsEnabled()) |
| + if (prober_->IsProbing()) |
| padding_needed = prober_->RecommendedPacketSize(); |
| else |
| padding_needed = padding_budget_->bytes_remaining(); |
| @@ -407,9 +410,4 @@ void PacedSender::UpdateBytesPerInterval(int64_t delta_time_ms) { |
| media_budget_->IncreaseBudget(delta_time_ms); |
| padding_budget_->IncreaseBudget(delta_time_ms); |
| } |
| - |
| -bool PacedSender::ProbingExperimentIsEnabled() const { |
| - return webrtc::field_trial::FindFullName("WebRTC-BitrateProbing") == |
| - "Enabled"; |
| -} |
| } // namespace webrtc |