Fix issue where the number of packets reported in tests/simulations sometimes are negative.

webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.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.
  */
 
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h"
 
+#include <algorithm>
+
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 
 namespace webrtc {
 namespace testing {
 namespace bwe {
 
 const int kFeedbackIntervalMs = 50;
 
@@ skipping 48 matching lines @@
   rbe_->IncomingPacketFeedbackVector(packet_feedback_vector);
   if (has_received_ack_) {
     int expected_packets = fb.packet_feedback_vector().back().sequence_number -
                            last_acked_seq_num_;
     // Assuming no reordering for now.
     if (expected_packets > 0) {
       int lost_packets = expected_packets -
                          static_cast<int>(fb.packet_feedback_vector().size());
       report_block_.fractionLost = (lost_packets << 8) / expected_packets;
       report_block_.cumulativeLost += lost_packets;
+      uint32_t unwrapped = seq_num_unwrapper_.Unwrap(
+          packet_feedback_vector.back().sequence_number);
       report_block_.extendedHighSeqNum =
-          packet_feedback_vector.back().sequence_number;
+          std::max(unwrapped, report_block_.extendedHighSeqNum);
       ReportBlockList report_blocks;
       report_blocks.push_back(report_block_);
       feedback_observer_->OnReceivedRtcpReceiverReport(
           report_blocks, rtt_ms, clock_->TimeInMilliseconds());
     }
     bitrate_controller_->Process();
 
     last_acked_seq_num_ = LatestSequenceNumber(
         packet_feedback_vector.back().sequence_number, last_acked_seq_num_);
   } else {
@@ skipping 57 matching lines @@
       packet_feedback_vector_.back().arrival_time_ms;
   FeedbackPacket* fb = new SendSideBweFeedback(
       flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_);
   packet_feedback_vector_.clear();
   return fb;
 }
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc