Refactored incoming bitrate estimator.

webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc

Index: webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
index 338c4d8e4d38f8d95da4fddf665247a70c301c02..290f0cb125efdc49a1b9851e41047239d25fb968 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
@@ -13,6 +13,7 @@
 #include <algorithm>
 
 #include "webrtc/base/logging.h"
+#include "webrtc/base/ptr_util.h"
 #include "webrtc/modules/congestion_controller/delay_based_bwe.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 
@@ -29,6 +30,8 @@ SendSideBweSender::SendSideBweSender(int kbps,
           BitrateController::CreateBitrateController(clock,
                                                      observer,
                                                      &event_log_)),
+      acknowledged_bitrate_estimator_(
+          rtc::MakeUnique<AcknowledgedBitrateEstimator>()),
       bwe_(new DelayBasedBwe(nullptr, clock)),
       feedback_observer_(bitrate_controller_->CreateRtcpBandwidthObserver()),
       clock_(clock),
@@ -72,8 +75,10 @@ void SendSideBweSender::GiveFeedback(const FeedbackPacket& feedback) {
   bwe_->OnRttUpdate(rtt_ms, rtt_ms);
   BWE_TEST_LOGGING_PLOT(1, "RTT", clock_->TimeInMilliseconds(), rtt_ms);
 
-  DelayBasedBwe::Result result =
-      bwe_->IncomingPacketFeedbackVector(packet_feedback_vector);
+  acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector(

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

Should we sort the packet vectors here as well? I don't think we have any
packet_processor in the current simulations that reorder packets, but if we did
we might run into trouble here. Maybe it would be sufficient to DCHECK that the
vector is sorted?

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

Yea a DCHECK is a great idea, will have to move the PacketFeedbackComparator for
this.

+      packet_feedback_vector);
+  DelayBasedBwe::Result result = bwe_->IncomingPacketFeedbackVector(
+      packet_feedback_vector, acknowledged_bitrate_estimator_->bitrate_bps());
   if (result.updated)
     bitrate_controller_->OnDelayBasedBweResult(result);