Refactored incoming bitrate estimator.

webrtc/modules/congestion_controller/send_side_congestion_controller.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.
  */
 
 #include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
+#include "webrtc/base/ptr_util.h"
 #include "webrtc/base/rate_limiter.h"
 #include "webrtc/base/socket.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
+#include "webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h"
 #include "webrtc/modules/congestion_controller/probe_controller.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
 
 namespace webrtc {
 namespace {
 
 static const int64_t kRetransmitWindowSizeMs = 500;
 
 // Makes sure that the bitrate and the min, max values are in valid range.
 static void ClampBitrates(int* bitrate_bps,
                           int* min_bitrate_bps,
                           int* max_bitrate_bps) {
   // TODO(holmer): We should make sure the default bitrates are set to 10 kbps,
   // and that we don't try to set the min bitrate to 0 from any applications.
   // The congestion controller should allow a min bitrate of 0.
   if (*min_bitrate_bps < congestion_controller::GetMinBitrateBps())
     *min_bitrate_bps = congestion_controller::GetMinBitrateBps();
   if (*max_bitrate_bps > 0)
     *max_bitrate_bps = std::max(*min_bitrate_bps, *max_bitrate_bps);
   if (*bitrate_bps > 0)
     *bitrate_bps = std::max(*min_bitrate_bps, *bitrate_bps);
 }
 
+class PacketFeedbackComparator {
+ public:
+  inline bool operator()(const webrtc::PacketFeedback& lhs,
+                         const webrtc::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;
+  }
+};
+
+std::vector<webrtc::PacketFeedback> ReceivedPacketFeedbackVector(
+    const std::vector<webrtc::PacketFeedback>& input) {
+  std::vector<PacketFeedback> sorted_packet_feedback_vector;
+  auto is_received = [](const webrtc::PacketFeedback& packet_feedback) {
+    return packet_feedback.arrival_time_ms !=
+           webrtc::PacketFeedback::kNotReceived;
+  };
+  std::copy_if(input.begin(), input.end(),
+               std::back_inserter(sorted_packet_feedback_vector), is_received);
+  return sorted_packet_feedback_vector;
+}
+
+void SortPacketFeedbackVector(
+    std::vector<webrtc::PacketFeedback>* const input) {
+  RTC_DCHECK(input);
+  std::sort(input->begin(), input->end(), PacketFeedbackComparator());
+}
+
 }  // namespace
 
 SendSideCongestionController::SendSideCongestionController(
     const Clock* clock,
     Observer* observer,
     RtcEventLog* event_log,
     PacketRouter* packet_router)
     : SendSideCongestionController(
           clock,
           observer,
           event_log,
           std::unique_ptr<PacedSender>(
               new PacedSender(clock, packet_router, event_log))) {}
 
 SendSideCongestionController::SendSideCongestionController(
     const Clock* clock,
     Observer* observer,
     RtcEventLog* event_log,
     std::unique_ptr<PacedSender> pacer)
     : clock_(clock),
       observer_(observer),
       event_log_(event_log),
       pacer_(std::move(pacer)),
       bitrate_controller_(
           BitrateController::CreateBitrateController(clock_, event_log)),
+      acknowledged_bitrate_estimator_(
+          rtc::MakeUnique<AcknowledgedBitrateEstimator>()),
       probe_controller_(new ProbeController(pacer_.get(), clock_)),
       retransmission_rate_limiter_(
           new RateLimiter(clock, kRetransmitWindowSizeMs)),
       transport_feedback_adapter_(clock_),
       last_reported_bitrate_bps_(0),
       last_reported_fraction_loss_(0),
       last_reported_rtt_(0),
       network_state_(kNetworkUp),
       min_bitrate_bps_(congestion_controller::GetMinBitrateBps()),
       delay_based_bwe_(new DelayBasedBwe(event_log_, clock_)) {
@@ skipping 58 matching lines @@
   // no longer exposed outside SendSideCongestionController.
   bitrate_controller_->ResetBitrates(bitrate_bps, min_bitrate_bps,
                                      max_bitrate_bps);
 
   transport_feedback_adapter_.SetNetworkIds(network_route.local_network_id,
                                             network_route.remote_network_id);
   {
     rtc::CritScope cs(&bwe_lock_);
     min_bitrate_bps_ = min_bitrate_bps;
     delay_based_bwe_.reset(new DelayBasedBwe(event_log_, clock_));
-    delay_based_bwe_->SetStartBitrate(bitrate_bps);
+    acknowledged_bitrate_estimator_.reset(

[tschumi, 2017/06/02 12:08:04]

Should we write a test for this ?

+        rtc::MakeUnique<AcknowledgedBitrateEstimator>()),

[terelius, 2017/06/02 12:14:06]

Should this be a semicolon?

[tschumi, 2017/06/02 13:13:05]

Yes

+        delay_based_bwe_->SetStartBitrate(bitrate_bps);
     delay_based_bwe_->SetMinBitrate(min_bitrate_bps);
   }
 
   probe_controller_->Reset();
   probe_controller_->SetBitrates(min_bitrate_bps, bitrate_bps, max_bitrate_bps);
 
   MaybeTriggerOnNetworkChanged();
 }
 
 BitrateController* SendSideCongestionController::GetBitrateController() const {
@@ skipping 85 matching lines @@
     size_t length,
     const PacedPacketInfo& pacing_info) {
   transport_feedback_adapter_.AddPacket(ssrc, sequence_number, length,
                                         pacing_info);
 }
 
 void SendSideCongestionController::OnTransportFeedback(
     const rtcp::TransportFeedback& feedback) {
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   transport_feedback_adapter_.OnTransportFeedback(feedback);
-  std::vector<PacketFeedback> feedback_vector =
-      transport_feedback_adapter_.GetTransportFeedbackVector();
+  std::vector<PacketFeedback> feedback_vector = ReceivedPacketFeedbackVector(
+      transport_feedback_adapter_.GetTransportFeedbackVector());
+  SortPacketFeedbackVector(&feedback_vector);
+  acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector(
+      feedback_vector);
   DelayBasedBwe::Result result;
   {
     rtc::CritScope cs(&bwe_lock_);
-    result = delay_based_bwe_->IncomingPacketFeedbackVector(feedback_vector);
+    result = delay_based_bwe_->IncomingPacketFeedbackVector(
+        feedback_vector, acknowledged_bitrate_estimator_->bitrate_bps());
   }
   if (result.updated)
     bitrate_controller_->OnDelayBasedBweResult(result);
 }
 
 std::vector<PacketFeedback>
 SendSideCongestionController::GetTransportFeedbackVector() const {
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   return transport_feedback_adapter_.GetTransportFeedbackVector();
 }
@@ skipping 50 matching lines @@
 bool SendSideCongestionController::IsSendQueueFull() const {
   return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs;
 }
 
 bool SendSideCongestionController::IsNetworkDown() const {
   rtc::CritScope cs(&network_state_lock_);
   return network_state_ == kNetworkDown;
 }
 
 }  // namespace webrtc