From 7ecc163d42661ec3e230e24af65a35364ea8d988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Wed, 2 Mar 2016 14:22:25 +0100 Subject: [PATCH] Report all packets to bitrate probing. Allows probing with audio packets to finish, preventing a busy loop for high-bitrate audio-only calls. BUG=chromium:589931, webrtc:5506 R=stefan@webrtc.org Review URL: https://codereview.webrtc.org/1750403003 . Cr-Commit-Position: refs/heads/master@{#11840} --- webrtc/modules/pacing/paced_sender.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc index 1b45adcf89..b56d28510f 100644 --- a/webrtc/modules/pacing/paced_sender.cc +++ b/webrtc/modules/pacing/paced_sender.cc @@ -431,13 +431,15 @@ bool PacedSender::SendPacket(const paced_sender::Packet& packet) { packet.retransmission); critsect_->Enter(); - // TODO(holmer): High priority packets should only be accounted for if we are - // allocating bandwidth for audio. - if (success && packet.priority != kHighPriority) { - // Update media bytes sent. + if (success) { prober_->PacketSent(clock_->TimeInMilliseconds(), packet.bytes); - media_budget_->UseBudget(packet.bytes); - padding_budget_->UseBudget(packet.bytes); + // TODO(holmer): High priority packets should only be accounted for if we + // are allocating bandwidth for audio. + if (packet.priority != kHighPriority) { + // Update media bytes sent. + media_budget_->UseBudget(packet.bytes); + padding_budget_->UseBudget(packet.bytes); + } } return success;