Ignore packets sent on old network route when receiving feedback.

webrtc/modules/congestion_controller/transport_feedback_adapter.cc

 /*
  *  Copyright (c) 2015 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 14 matching lines @@
     rtcp::TransportFeedback::kDeltaScaleFactor * (1 << 8);
 const int64_t kBaseTimestampRangeSizeUs = kBaseTimestampScaleFactor * (1 << 24);
 
 TransportFeedbackAdapter::TransportFeedbackAdapter(const Clock* clock)
     : send_side_bwe_with_overhead_(
           webrtc::field_trial::IsEnabled("WebRTC-SendSideBwe-WithOverhead")),
       transport_overhead_bytes_per_packet_(0),
       send_time_history_(clock, kSendTimeHistoryWindowMs),
       clock_(clock),
       current_offset_ms_(kNoTimestamp),
-      last_timestamp_us_(kNoTimestamp) {}
+      last_timestamp_us_(kNoTimestamp),
+      local_net_id_(0),
+      remote_net_id_(0) {}
 
 TransportFeedbackAdapter::~TransportFeedbackAdapter() {}
 
 void TransportFeedbackAdapter::AddPacket(uint16_t sequence_number,
                                          size_t length,
                                          const PacedPacketInfo& pacing_info) {
   rtc::CritScope cs(&lock_);
   if (send_side_bwe_with_overhead_) {
     length += transport_overhead_bytes_per_packet_;
   }
-  send_time_history_.AddAndRemoveOld(sequence_number, length, pacing_info);
+  constexpr int64_t kNoArrivalTimeMs = -1;  // Arrival time is ignored.
+  constexpr int64_t kNoSendTimeMs = -1;     // Send time is set by OnSentPacket.
+  int64_t creation_time_ms = clock_->TimeInMilliseconds();
+  send_time_history_.AddAndRemoveOld(PacketFeedback(

[philipel, 2017/03/15 10:38:37]

I know it's more of a refactoring task, but having a ctor for PacketFeedback
that does not take arrival time and send time as parameters would make this
segment a lot cleaner.

[stefan-webrtc, 2017/03/15 10:51:39]

Done.

+      creation_time_ms, kNoArrivalTimeMs, kNoSendTimeMs, sequence_number,
+      length, local_net_id_, remote_net_id_, pacing_info));
 }
 
 void TransportFeedbackAdapter::OnSentPacket(uint16_t sequence_number,
                                             int64_t send_time_ms) {
   rtc::CritScope cs(&lock_);
   send_time_history_.OnSentPacket(sequence_number, send_time_ms);
 }
 
 void TransportFeedbackAdapter::SetTransportOverhead(
     int transport_overhead_bytes_per_packet) {
   rtc::CritScope cs(&lock_);
   transport_overhead_bytes_per_packet_ = transport_overhead_bytes_per_packet;
 }
 
-void TransportFeedbackAdapter::ClearSendTimeHistory() {
+void TransportFeedbackAdapter::SetNetworkIds(uint16_t local_id,
+                                             uint16_t remote_id) {
   rtc::CritScope cs(&lock_);
-  send_time_history_.Clear();
+  local_net_id_ = local_id;
+  remote_net_id_ = remote_id;
 }
 
 std::vector<PacketFeedback> TransportFeedbackAdapter::GetPacketFeedbackVector(
     const rtcp::TransportFeedback& feedback) {
   int64_t timestamp_us = feedback.GetBaseTimeUs();
   // Add timestamp deltas to a local time base selected on first packet arrival.
   // This won't be the true time base, but makes it easier to manually inspect
   // time stamps.
   if (last_timestamp_us_ == kNoTimestamp) {
     current_offset_ms_ = clock_->TimeInMilliseconds();
@@ skipping 34 matching lines @@
     uint16_t seq_num = feedback.GetBaseSequence();
     for (const auto& packet : received_packets) {
       // Insert into the vector those unreceived packets which precede this
       // iteration's received packet.
       for (; seq_num != packet.sequence_number(); ++seq_num) {
         PacketFeedback packet_feedback(PacketFeedback::kNotReceived, seq_num);
         // 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);
+        if (packet_feedback.local_net_id == local_net_id_ &&
+            packet_feedback.remote_net_id == remote_net_id_) {
+          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);
+      if (packet_feedback.local_net_id == local_net_id_ &&
+          packet_feedback.remote_net_id == remote_net_id_) {
+        packet_feedback_vector.push_back(packet_feedback);
+      }
 
       ++seq_num;
     }
 
     if (failed_lookups > 0) {
       LOG(LS_WARNING) << "Failed to lookup send time for " << failed_lookups
                       << " packet" << (failed_lookups > 1 ? "s" : "")
                       << ". Send time history too small?";
     }
   }
   return packet_feedback_vector;
 }
 
 void TransportFeedbackAdapter::OnTransportFeedback(
     const rtcp::TransportFeedback& feedback) {
   last_packet_feedback_vector_ = GetPacketFeedbackVector(feedback);
 }
 
 std::vector<PacketFeedback>
 TransportFeedbackAdapter::GetTransportFeedbackVector() const {
   return last_packet_feedback_vector_;
 }
 }  // namespace webrtc