Don't account for audio in the pacer budget.

webrtc/modules/pacing/paced_sender.cc

Index: webrtc/modules/pacing/paced_sender.cc
diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc
index bfa6b53b6bf728c3ef78ff15e5f89c31ebf6a2fa..121f860c7daa344f0854530ee18a9cfc0fdb5a84 100644
--- a/webrtc/modules/pacing/paced_sender.cc
+++ b/webrtc/modules/pacing/paced_sender.cc
@@ -389,10 +389,7 @@ int32_t PacedSender::Process() {
     // reinsert it if send fails.
     const paced_sender::Packet& packet = packets_->BeginPop();
 
-    // TODO(holmer): Because of this bug issue 5307 we have to send audio
-    // packets even when the pacer is paused. Here we assume audio packets are
-    // always high priority and that they are the only high priority packets.
-    if ((!paused_ || packet.priority == kHighPriority) && SendPacket(packet)) {
+    if (SendPacket(packet)) {
       // Send succeeded, remove it from the queue.
       packets_->FinalizePop(packet);
       if (prober_->IsProbing())
@@ -421,6 +418,11 @@ int32_t PacedSender::Process() {
 }
 
 bool PacedSender::SendPacket(const paced_sender::Packet& packet) {
+  // TODO(holmer): Because of this bug issue 5307 we have to send audio
+  // packets even when the pacer is paused. Here we assume audio packets are
+  // always high priority and that they are the only high priority packets.
+  if (paused_ && packet.priority != kHighPriority)
+    return false;
   critsect_->Leave();
   const bool success = callback_->TimeToSendPacket(packet.ssrc,
                                                    packet.sequence_number,
@@ -428,7 +430,9 @@ bool PacedSender::SendPacket(const paced_sender::Packet& packet) {
                                                    packet.retransmission);
   critsect_->Enter();
 
-  if (success) {
+  // TODO(holmer): High priority packets should only be accounted for if we are
+  // allocating bandwidth for audio.
+  if (success && packet.priority != kHighPriority) {

[mflodman, 2015/12/14 13:19:29]

Is this budget excluding logic tested in the unit test?

[stefan-webrtc, 2015/12/16 12:42:52]

Not explicitly, but it is verified by the tests I had to modify. Do you want me
to add a separate test for this?

[mflodman, 2015/12/16 12:53:14]

Might be good, but not necessary if tested anyway.

[stefan-webrtc, 2015/12/16 15:29:07]

Might as well do it. :)

     // Update media bytes sent.
     prober_->PacketSent(clock_->TimeInMilliseconds(), packet.bytes);
     media_budget_->UseBudget(packet.bytes);