Ignore packets with reordered timestamps when doing BWE.

webrtc/modules/remote_bitrate_estimator/inter_arrival.cc

 /*
  *  Copyright (c) 2013 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.
  */
 
 #include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h"
 
 #include <algorithm>
 #include <cassert>
 
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/interface/module_common_types.h"
 
 namespace webrtc {
 
 static const int kBurstDeltaThresholdMs  = 5;
 
 InterArrival::InterArrival(uint32_t timestamp_group_length_ticks,
                            double timestamp_to_ms_coeff,
                            bool enable_burst_grouping)
     : kTimestampGroupLengthTicks(timestamp_group_length_ticks),
@@ skipping 19 matching lines @@
     current_timestamp_group_.first_timestamp = timestamp;
   } else if (!PacketInOrder(timestamp)) {
     return false;
   } else if (NewTimestampGroup(arrival_time_ms, timestamp)) {
     // First packet of a later frame, the previous frame sample is ready.
     if (prev_timestamp_group_.complete_time_ms >= 0) {
       *timestamp_delta = current_timestamp_group_.timestamp -
                          prev_timestamp_group_.timestamp;
       *arrival_time_delta_ms = current_timestamp_group_.complete_time_ms -
                                prev_timestamp_group_.complete_time_ms;
+      if (*arrival_time_delta_ms < 0) {
+        // The group of packets has been reordered since receiving its local
+        // arrival timestamp.
+        LOG(LS_WARNING) << "Packets are being reordered on the path from the "
+                           "socket to the bandwidth estimator. Ignoring this "
+                           "packet for bandwidth estimation.";
+        return false;
+      }
       assert(*arrival_time_delta_ms >= 0);

[pbos-webrtc, 2015/07/24 09:04:37]

Do you need this assert now? :D

       *packet_size_delta = static_cast<int>(current_timestamp_group_.size) -
           static_cast<int>(prev_timestamp_group_.size);
       calculated_deltas = true;
     }
     prev_timestamp_group_ = current_timestamp_group_;
     // The new timestamp is now the current frame.
     current_timestamp_group_.first_timestamp = timestamp;
     current_timestamp_group_.timestamp = timestamp;
     current_timestamp_group_.size = 0;
   }
@@ skipping 46 matching lines @@
       current_timestamp_group_.complete_time_ms;
   uint32_t timestamp_diff = timestamp - current_timestamp_group_.timestamp;
   int64_t ts_delta_ms = timestamp_to_ms_coeff_ * timestamp_diff + 0.5;
   if (ts_delta_ms == 0)
     return true;
   int propagation_delta_ms = arrival_time_delta_ms - ts_delta_ms;
   return propagation_delta_ms < 0 &&
       arrival_time_delta_ms <= kBurstDeltaThresholdMs;
 }
 }  // namespace webrtc