Fix BWE simulations so that it uses the delay based BWE.

webrtc/modules/remote_bitrate_estimator/test/bwe.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/bwe.h"
 
 #include <limits>
 
 #include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h"
+#include "webrtc/modules/remote_bitrate_estimator/test/estimators/abs_send_time.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h"
 
 namespace webrtc {
 namespace testing {
 namespace bwe {
 
 // With the assumption that packet loss is lower than 97%, the max gap
 // between elements in the set is lower than 0x8000, hence we have a
 // total order in the set. For (x,y,z) subset of the LinkedSet,
 // (x<=y and y<=z) ==> x<=z so the set can be sorted.
@@ skipping 53 matching lines @@
   return static_cast<int64_t>(timestamp) * kTimestampToMs;
 }
 
 BweSender* CreateBweSender(BandwidthEstimatorType estimator,
                            int kbps,
                            BitrateObserver* observer,
                            Clock* clock) {
   switch (estimator) {
     case kRembEstimator:
       return new RembBweSender(kbps, observer, clock);
-    case kFullSendSideEstimator:
-      return new FullBweSender(kbps, observer, clock);
+    case kAbsSendTimeEstimator:
+      return new AbsSendTimeBweSender(kbps, observer, clock);
     case kNadaEstimator:
       return new NadaBweSender(kbps, observer, clock);
+    case kSendSideEstimator:
+      return new SendSideBweSender(kbps, observer, clock);
     case kTcpEstimator:
       FALLTHROUGH();
     case kNullEstimator:
       return new NullBweSender();
   }
   assert(false);
   return NULL;
 }
 
 BweReceiver* CreateBweReceiver(BandwidthEstimatorType type,
                                int flow_id,
                                bool plot) {
   switch (type) {
     case kRembEstimator:
       return new RembReceiver(flow_id, plot);
-    case kFullSendSideEstimator:
-      return new SendSideBweReceiver(flow_id);
+    case kAbsSendTimeEstimator:
+      return new AbsSendTimeBweReceiver(flow_id);
     case kNadaEstimator:
       return new NadaBweReceiver(flow_id);
+    case kSendSideEstimator:
+      return new SendSideBweReceiver(flow_id);
     case kTcpEstimator:
       return new TcpBweReceiver(flow_id);
     case kNullEstimator:
       return new BweReceiver(flow_id);
   }
   assert(false);
   return NULL;
 }
 
 // Take into account all LinkedSet content.
@@ skipping 146 matching lines @@
 
 float LossAccount::LossRatio() {
   if (num_total == 0)
     return 0.0f;
   return static_cast<float>(num_lost) / num_total;
 }
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc