GetTransportFeedbackVector() includes unreceived packets, sorted by seq-num

webrtc/modules/congestion_controller/transport_feedback_adapter.cc

Index: webrtc/modules/congestion_controller/transport_feedback_adapter.cc
diff --git a/webrtc/modules/congestion_controller/transport_feedback_adapter.cc b/webrtc/modules/congestion_controller/transport_feedback_adapter.cc
index 4d502c0e874afd38f1ab479dc5ff0acbb0fd15eb..6de543dd6a96cd04a0d5561ffadd60c8c7ac317a 100644
--- a/webrtc/modules/congestion_controller/transport_feedback_adapter.cc
+++ b/webrtc/modules/congestion_controller/transport_feedback_adapter.cc
@@ -30,17 +30,6 @@ const int64_t kBaseTimestampScaleFactor =
     rtcp::TransportFeedback::kDeltaScaleFactor * (1 << 8);
 const int64_t kBaseTimestampRangeSizeUs = kBaseTimestampScaleFactor * (1 << 24);
 
-class PacketFeedbackComparator {
- public:
-  inline bool operator()(const PacketFeedback& lhs, const PacketFeedback& rhs) {
-    if (lhs.arrival_time_ms != rhs.arrival_time_ms)
-      return lhs.arrival_time_ms < rhs.arrival_time_ms;
-    if (lhs.send_time_ms != rhs.send_time_ms)
-      return lhs.send_time_ms < rhs.send_time_ms;
-    return lhs.sequence_number < rhs.sequence_number;
-  }
-};
-
 TransportFeedbackAdapter::TransportFeedbackAdapter(
     RtcEventLog* event_log,
     Clock* clock,
@@ -133,10 +122,10 @@ std::vector<PacketFeedback> TransportFeedbackAdapter::GetPacketFeedbackVector(
   }
   last_timestamp_us_ = timestamp_us;
 
-  auto received_packets = feedback.GetReceivedPackets();
+  auto status_vector = feedback.GetStatusVector();
   std::vector<PacketFeedback> packet_feedback_vector;
-  packet_feedback_vector.reserve(received_packets.size());
-  if (received_packets.empty()) {
+  packet_feedback_vector.reserve(status_vector.size());
+  if (status_vector.empty()) {
     LOG(LS_INFO) << "Empty transport feedback packet received.";
     return packet_feedback_vector;
   }
@@ -145,16 +134,30 @@ std::vector<PacketFeedback> TransportFeedbackAdapter::GetPacketFeedbackVector(
     size_t failed_lookups = 0;
     int64_t offset_us = 0;
     int64_t timestamp_ms = 0;
+    uint16_t seq_no = feedback.GetBaseSequence();
     for (const auto& packet : feedback.GetReceivedPackets()) {
+      // Insert into the vector those unreceived packets which precede this
+      // iteration's received packet.
+      for (; seq_no != packet.sequence_number(); ++seq_no) {
+        PacketFeedback packet_feedback(PacketFeedback::kLost, seq_no);

[stefan-webrtc, 2017/02/28 14:51:12]

Is kLost the right name? It indicates that he packet is lost, but it may not be,
it could also just be late and reordered. Maybe kNotAcked?

[elad.alon_webrtc.org, 2017/02/28 15:20:18]

I was thinking kNotReceived, but I was afraid some would confuse it with
StatusSymbol::kNotReceived. Shall I got with kNotAcked, then, or kNotReceived?

+        // Note: Element not removed from history because it might be reported
+        // as received by another feedback.
+        if (!send_time_history_.GetFeedback(&packet_feedback, false))
+          ++failed_lookups;
+        packet_feedback_vector.push_back(packet_feedback);
+      }
+
+      // Handle this iteration's received packet.
       offset_us += packet.delta_us();
       timestamp_ms = current_offset_ms_ + (offset_us / 1000);
       PacketFeedback packet_feedback(timestamp_ms, packet.sequence_number());
       if (!send_time_history_.GetFeedback(&packet_feedback, true))
         ++failed_lookups;
       packet_feedback_vector.push_back(packet_feedback);
+
+      ++seq_no;
     }
-    std::sort(packet_feedback_vector.begin(), packet_feedback_vector.end(),
-              PacketFeedbackComparator());
+
     if (failed_lookups > 0) {
       LOG(LS_WARNING) << "Failed to lookup send time for " << failed_lookups
                       << " packet" << (failed_lookups > 1 ? "s" : "")