Enable trendline experiment and bayesian bitrate estimator experiment by default.

webrtc/call/rampup_tests.cc

Index: webrtc/call/rampup_tests.cc
diff --git a/webrtc/call/rampup_tests.cc b/webrtc/call/rampup_tests.cc
index 0a2a7384d8dd7d0ad1eec0a1c68a88ee3b8b939c..9b7dbb828df203a3d3adcacf9a91b0b8433f5d1d 100644
--- a/webrtc/call/rampup_tests.cc
+++ b/webrtc/call/rampup_tests.cc
@@ -25,6 +25,7 @@ static const int kExpectedHighVideoBitrateBps = 80000;
 static const int kExpectedHighAudioBitrateBps = 30000;
 static const int kLowBandwidthLimitBps = 20000;
 static const int kExpectedLowBitrateBps = 20000;
+static const int kUnlimitedCapacityBps = 10000000;
 
 std::vector<uint32_t> GenerateSsrcs(size_t num_streams, uint32_t ssrc_offset) {
   std::vector<uint32_t> ssrcs;
@@ -417,8 +418,9 @@ RampUpDownUpTester::RampUpDownUpTester(size_t num_video_streams,
                    rtx,
                    red,
                    report_perf_stats),
-      link_rates_({GetHighLinkCapacity(), kLowBandwidthLimitBps / 1000,
-                   GetHighLinkCapacity(), 0}),
+      link_rates_({GetExpectedHighBitrate() / 1000,
+                   kLowBandwidthLimitBps / 1000, kUnlimitedCapacityBps / 1000,

[terelius, 2017/03/31 11:07:21]

Do we really want to use kUnlimitedCapacityBps in the second rampup stage?

[stefan-webrtc, 2017/03/31 13:28:44]

Done.

+                   0}),
       test_state_(kFirstRampup),
       next_state_(kTransitionToNextState),
       state_start_ms_(clock_->TimeInMilliseconds()),
@@ -488,10 +490,6 @@ int RampUpDownUpTester::GetExpectedHighBitrate() const {
   return expected_bitrate_bps;
 }
 
-int RampUpDownUpTester::GetHighLinkCapacity() const {
-  return 4 * GetExpectedHighBitrate() / (3 * 1000);
-}
-
 size_t RampUpDownUpTester::GetFecBytes() const {
   size_t flex_fec_bytes = 0;
   if (num_flexfec_streams_ > 0) {