Always take retransmissions into account when deciding pacing order

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 58 matching lines @@
 };
 
 // Used by priority queue to sort packets.
 struct Comparator {
   bool operator()(const Packet* first, const Packet* second) {
     // Highest prio = 0.
     if (first->priority != second->priority)
       return first->priority > second->priority;
 
     // Retransmissions go first.
-    if (second->retransmission && !first->retransmission)
-      return true;
+    if (second->retransmission != first->retransmission)
+      return second->retransmission;
 
     // Older frames have higher prio.
     if (first->capture_time_ms != second->capture_time_ms)
       return first->capture_time_ms > second->capture_time_ms;
 
     return first->enqueue_order > second->enqueue_order;
   }
 };
 
 // Class encapsulating a priority queue with some extensions.
@@ skipping 380 matching lines @@
     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