Don't account for audio in the pacer budget.

webrtc/modules/pacing/paced_sender.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 371 matching lines @@
   }
   while (!packets_->Empty()) {
     if (media_budget_->bytes_remaining() == 0 && !prober_->IsProbing())
       return 0;
 
     // Since we need to release the lock in order to send, we first pop the
     // element from the priority queue but keep it in storage, so that we can
     // 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())
         return 0;
     } else {
       // Send failed, put it back into the queue.
       packets_->CancelPop(packet);
       return 0;
     }
   }
 
   // TODO(holmer): Remove the paused_ check when issue 5307 has been fixed.
   if (paused_ || !packets_->Empty())
     return 0;
 
   size_t padding_needed;
   if (prober_->IsProbing()) {
     padding_needed = prober_->RecommendedPacketSize();
   } else {
     padding_needed = padding_budget_->bytes_remaining();
   }
 
   if (padding_needed > 0)
     SendPadding(static_cast<size_t>(padding_needed));
   return 0;
 }
 
 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,
                                                    packet.capture_time_ms,
                                                    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);
     padding_budget_->UseBudget(packet.bytes);
   }
 
   return success;
 }
 
 void PacedSender::SendPadding(size_t padding_needed) {
   critsect_->Leave();
   size_t bytes_sent = callback_->TimeToSendPadding(padding_needed);
   critsect_->Enter();
 
   if (bytes_sent > 0) {
     prober_->PacketSent(clock_->TimeInMilliseconds(), bytes_sent);
     media_budget_->UseBudget(bytes_sent);
     padding_budget_->UseBudget(bytes_sent);
   }
 }
 
 void PacedSender::UpdateBytesPerInterval(int64_t delta_time_ms) {
   media_budget_->IncreaseBudget(delta_time_ms);
   padding_budget_->IncreaseBudget(delta_time_ms);
 }
 }  // namespace webrtc