Fix suspend below min bitrate in new API by making it possible to set min bitrate at the receive-si…

webrtc/video/rampup_tests.cc

Index: webrtc/video/rampup_tests.cc
diff --git a/webrtc/video/rampup_tests.cc b/webrtc/video/rampup_tests.cc
index f69f8ce97b5ba562fc421d7ae9339fa1626a58cd..ec014206bd0289909e97afe7c302e7efa5283900 100644
--- a/webrtc/video/rampup_tests.cc
+++ b/webrtc/video/rampup_tests.cc
@@ -29,8 +29,7 @@
 namespace webrtc {
 namespace {
 
-static const int kMaxPacketSize = 1500;
-const uint32_t kRemoteBitrateEstimatorMinBitrateBps = 30000;
+static const int64_t kPollIntervalMs = 250;
 
 std::vector<uint32_t> GenerateSsrcs(size_t num_streams,
                                     uint32_t ssrc_offset) {
@@ -41,294 +40,298 @@ std::vector<uint32_t> GenerateSsrcs(size_t num_streams,
 }
 }  // namespace
 
-StreamObserver::StreamObserver(const SsrcMap& rtx_media_ssrcs,
-                               newapi::Transport* feedback_transport,
-                               Clock* clock)
-    : clock_(clock),
-      test_done_(EventWrapper::Create()),
-      rtp_parser_(RtpHeaderParser::Create()),
-      feedback_transport_(feedback_transport),
-      receive_stats_(ReceiveStatistics::Create(clock)),
-      payload_registry_(
-          new RTPPayloadRegistry(RTPPayloadStrategy::CreateStrategy(false))),
-      remote_bitrate_estimator_(nullptr),
+RampUpTester::RampUpTester(size_t num_streams,
+                           unsigned int start_bitrate_bps,
+                           const std::string& extension_type,
+                           bool rtx,
+                           bool red)
+    : EndToEndTest(test::CallTest::kLongTimeoutMs),
+      event_(false, false),
+      clock_(Clock::GetRealTimeClock()),
+      num_streams_(num_streams),
+      rtx_(rtx),
+      red_(red),
+      send_stream_(nullptr),
+      start_bitrate_bps_(start_bitrate_bps),
+      start_bitrate_verified_(false),
       expected_bitrate_bps_(0),
-      start_bitrate_bps_(0),
-      rtx_media_ssrcs_(rtx_media_ssrcs),
-      total_sent_(0),
-      padding_sent_(0),
-      rtx_media_sent_(0),
-      total_packets_sent_(0),
-      padding_packets_sent_(0),
-      rtx_media_packets_sent_(0),
       test_start_ms_(clock_->TimeInMilliseconds()),
-      ramp_up_finished_ms_(0) {
-  // Ideally we would only have to instantiate an RtcpSender, an
-  // RtpHeaderParser and a RemoteBitrateEstimator here, but due to the current
-  // state of the RTP module we need a full module and receive statistics to
-  // be able to produce an RTCP with REMB.
-  RtpRtcp::Configuration config;
-  config.receive_statistics = receive_stats_.get();
-  feedback_transport_.Enable();
-  config.outgoing_transport = &feedback_transport_;
-  rtp_rtcp_.reset(RtpRtcp::CreateRtpRtcp(config));
-  rtp_rtcp_->SetREMBStatus(true);
-  rtp_rtcp_->SetRTCPStatus(kRtcpNonCompound);
-  packet_router_.reset(new PacketRouter());
-  packet_router_->AddRtpModule(rtp_rtcp_.get());
-  rtp_parser_->RegisterRtpHeaderExtension(kRtpExtensionAbsoluteSendTime,
-                                          kAbsSendTimeExtensionId);
-  rtp_parser_->RegisterRtpHeaderExtension(kRtpExtensionTransmissionTimeOffset,
-                                          kTransmissionTimeOffsetExtensionId);
-  rtp_parser_->RegisterRtpHeaderExtension(kRtpExtensionTransportSequenceNumber,
-                                          kTransportSequenceNumberExtensionId);
-  payload_registry_->SetRtxPayloadType(RampUpTest::kSendRtxPayloadType,
-                                       RampUpTest::kFakeSendPayloadType);
-}
-
-StreamObserver::~StreamObserver() {
-  packet_router_->RemoveRtpModule(rtp_rtcp_.get());
-}
-
-void StreamObserver::set_expected_bitrate_bps(
-    unsigned int expected_bitrate_bps) {
-  rtc::CritScope lock(&crit_);
-  expected_bitrate_bps_ = expected_bitrate_bps;
-}
-
-void StreamObserver::set_start_bitrate_bps(unsigned int start_bitrate_bps) {
-  rtc::CritScope lock(&crit_);
-  start_bitrate_bps_ = start_bitrate_bps;
-}
-
-void StreamObserver::OnReceiveBitrateChanged(
-    const std::vector<unsigned int>& ssrcs, unsigned int bitrate) {
-  rtc::CritScope lock(&crit_);
-  RTC_DCHECK_GT(expected_bitrate_bps_, 0u);
+      ramp_up_finished_ms_(-1),
+      extension_type_(extension_type),
+      ssrcs_(GenerateSsrcs(num_streams, 100)),
+      rtx_ssrcs_(GenerateSsrcs(num_streams, 200)),
+      poller_thread_(ThreadWrapper::CreateThread(&BitrateStatsPollingThread,
+                                                 this,
+                                                 "BitrateStatsPollingThread")),
+      sender_call_(nullptr) {
+  if (rtx_) {
+    for (size_t i = 0; i < ssrcs_.size(); ++i)
+      rtx_ssrc_map_[rtx_ssrcs_[i]] = ssrcs_[i];
+  }
+  poller_thread_->Start();
+}
+
+RampUpTester::~RampUpTester() {
+  event_.Set();
+  poller_thread_->Stop();
+}
+
+Call::Config RampUpTester::GetSenderCallConfig() {
+  Call::Config call_config;
   if (start_bitrate_bps_ != 0) {
-    // For tests with an explicitly set start bitrate, verify the first
-    // bitrate estimate is close to the start bitrate and lower than the
-    // test target bitrate. This is to verify a call respects the configured
-    // start bitrate, but due to the BWE implementation we can't guarantee the
-    // first estimate really is as high as the start bitrate.
-    EXPECT_GT(bitrate, 0.9 * start_bitrate_bps_);
-    start_bitrate_bps_ = 0;
+    call_config.bitrate_config.start_bitrate_bps = start_bitrate_bps_;
   }
-  if (bitrate >= expected_bitrate_bps_) {
-    ramp_up_finished_ms_ = clock_->TimeInMilliseconds();
-    // Just trigger if there was any rtx padding packet.
-    if (rtx_media_ssrcs_.empty() || rtx_media_sent_ > 0) {
-      TriggerTestDone();
+  call_config.bitrate_config.min_bitrate_bps = 10000;
+  return call_config;
+}
+
+void RampUpTester::OnStreamsCreated(
+    VideoSendStream* send_stream,
+    const std::vector<VideoReceiveStream*>& receive_streams) {
+  send_stream_ = send_stream;
+}
+
+size_t RampUpTester::GetNumStreams() const {
+  return num_streams_;
+}
+
+void RampUpTester::ModifyConfigs(
+    VideoSendStream::Config* send_config,
+    std::vector<VideoReceiveStream::Config>* receive_configs,
+    VideoEncoderConfig* encoder_config) {
+  send_config->suspend_below_min_bitrate = true;
+
+  if (num_streams_ == 1) {
+    encoder_config->streams[0].target_bitrate_bps =
+        encoder_config->streams[0].max_bitrate_bps = 2000000;
+    // For single stream rampup until 1mbps
+    expected_bitrate_bps_ = kSingleStreamTargetBps;
+  } else {
+    // For multi stream rampup until all streams are being sent. That means
+    // enough birate to send all the target streams plus the min bitrate of
+    // the last one.
+    expected_bitrate_bps_ = encoder_config->streams.back().min_bitrate_bps;
+    for (size_t i = 0; i < encoder_config->streams.size() - 1; ++i) {
+      expected_bitrate_bps_ += encoder_config->streams[i].target_bitrate_bps;
     }
   }
-  rtp_rtcp_->SetREMBData(bitrate, ssrcs);
-  rtp_rtcp_->Process();
-}
-
-bool StreamObserver::SendRtp(const uint8_t* packet, size_t length) {
-  rtc::CritScope lock(&crit_);
-  RTPHeader header;
-  EXPECT_TRUE(rtp_parser_->Parse(packet, length, &header));
-  receive_stats_->IncomingPacket(header, length, false);
-  payload_registry_->SetIncomingPayloadType(header);
-  RTC_DCHECK(remote_bitrate_estimator_ != nullptr);
-  remote_bitrate_estimator_->IncomingPacket(
-      clock_->TimeInMilliseconds(), length - header.headerLength, header, true);
-  if (remote_bitrate_estimator_->TimeUntilNextProcess() <= 0) {
-    remote_bitrate_estimator_->Process();
-    rtp_rtcp_->Process();
-  }
-  total_sent_ += length;
-  padding_sent_ += header.paddingLength;
-  ++total_packets_sent_;
-  if (header.paddingLength > 0)
-    ++padding_packets_sent_;
-  // Handle RTX retransmission, but only for non-padding-only packets.
-  if (rtx_media_ssrcs_.find(header.ssrc) != rtx_media_ssrcs_.end() &&
-      header.headerLength + header.paddingLength != length) {
-    rtx_media_sent_ += length - header.headerLength - header.paddingLength;
-    if (header.paddingLength == 0)
-      ++rtx_media_packets_sent_;
-    uint8_t restored_packet[kMaxPacketSize];
-    uint8_t* restored_packet_ptr = restored_packet;
-    size_t restored_length = length;
-    EXPECT_TRUE(payload_registry_->RestoreOriginalPacket(
-        &restored_packet_ptr, packet, &restored_length,
-        rtx_media_ssrcs_[header.ssrc], header));
-    EXPECT_TRUE(
-        rtp_parser_->Parse(restored_packet_ptr, restored_length, &header));
+
+  send_config->rtp.extensions.clear();
+
+  bool remb;
+  if (extension_type_ == RtpExtension::kAbsSendTime) {
+    remb = true;
+    send_config->rtp.extensions.push_back(
+        RtpExtension(extension_type_.c_str(), kAbsSendTimeExtensionId));
+  } else if (extension_type_ == RtpExtension::kTransportSequenceNumber) {
+    remb = false;
+    send_config->rtp.extensions.push_back(RtpExtension(
+        extension_type_.c_str(), kTransportSequenceNumberExtensionId));
   } else {
-    rtp_rtcp_->SetRemoteSSRC(header.ssrc);
+    remb = true;
+    send_config->rtp.extensions.push_back(RtpExtension(
+        extension_type_.c_str(), kTransmissionTimeOffsetExtensionId));
   }
-  return true;
-}
 
-bool StreamObserver::SendRtcp(const uint8_t* packet, size_t length) {
-  return true;
+  send_config->rtp.nack.rtp_history_ms = test::CallTest::kNackRtpHistoryMs;
+  send_config->rtp.ssrcs = ssrcs_;
+  if (rtx_) {
+    send_config->rtp.rtx.payload_type = test::CallTest::kSendRtxPayloadType;
+    send_config->rtp.rtx.ssrcs = rtx_ssrcs_;
+  }
+  if (red_) {
+    send_config->rtp.fec.ulpfec_payload_type =
+        test::CallTest::kUlpfecPayloadType;
+    send_config->rtp.fec.red_payload_type = test::CallTest::kRedPayloadType;
+  }
+
+  size_t i = 0;
+  for (VideoReceiveStream::Config& recv_config : *receive_configs) {
+    recv_config.rtp.remb = remb;
+    recv_config.rtp.extensions = send_config->rtp.extensions;
+
+    recv_config.rtp.remote_ssrc = ssrcs_[i];
+    recv_config.rtp.nack.rtp_history_ms = send_config->rtp.nack.rtp_history_ms;
+
+    if (red_) {
+      recv_config.rtp.fec.red_payload_type =
+          send_config->rtp.fec.red_payload_type;
+      recv_config.rtp.fec.ulpfec_payload_type =
+          send_config->rtp.fec.ulpfec_payload_type;
+    }
+
+    if (rtx_) {
+      recv_config.rtp.rtx[send_config->encoder_settings.payload_type].ssrc =
+          rtx_ssrcs_[i];
+      recv_config.rtp.rtx[send_config->encoder_settings.payload_type]
+          .payload_type = send_config->rtp.rtx.payload_type;
+    }
+    ++i;
+  }
 }
 
-EventTypeWrapper StreamObserver::Wait() {
-  return test_done_->Wait(test::CallTest::kLongTimeoutMs);
+void RampUpTester::OnCallsCreated(Call* sender_call, Call* receiver_call) {
+  sender_call_ = sender_call;
 }
 
-void StreamObserver::SetRemoteBitrateEstimator(RemoteBitrateEstimator* rbe) {
-  remote_bitrate_estimator_.reset(rbe);
+bool RampUpTester::BitrateStatsPollingThread(void* obj) {
+  return static_cast<RampUpTester*>(obj)->PollStats();
 }
 
-PacketRouter* StreamObserver::GetPacketRouter() {
-  return packet_router_.get();
+bool RampUpTester::PollStats() {
+  if (sender_call_) {
+    Call::Stats stats = sender_call_->GetStats();
+
+    RTC_DCHECK_GT(expected_bitrate_bps_, 0);
+    if (!start_bitrate_verified_ && start_bitrate_bps_ != 0) {
+      // For tests with an explicitly set start bitrate, verify the first
+      // bitrate estimate is close to the start bitrate and lower than the
+      // test target bitrate. This is to verify a call respects the configured
+      // start bitrate, but due to the BWE implementation we can't guarantee the
+      // first estimate really is as high as the start bitrate.
+      EXPECT_GT(stats.send_bandwidth_bps, 0.9 * start_bitrate_bps_);
+      start_bitrate_verified_ = true;
+    }
+    if (stats.send_bandwidth_bps >= expected_bitrate_bps_) {
+      ramp_up_finished_ms_ = clock_->TimeInMilliseconds();
+      observation_complete_->Set();
+    }
+  }
+
+  return !event_.Wait(kPollIntervalMs);
 }
 
-void StreamObserver::ReportResult(const std::string& measurement,
-                  size_t value,
-                  const std::string& units) {
+void RampUpTester::ReportResult(const std::string& measurement,
+                                size_t value,
+                                const std::string& units) const {
   webrtc::test::PrintResult(
       measurement, "",
       ::testing::UnitTest::GetInstance()->current_test_info()->name(),
       value, units, false);
 }
 
-void StreamObserver::TriggerTestDone() EXCLUSIVE_LOCKS_REQUIRED(crit_) {
-  ReportResult("ramp-up-total-sent", total_sent_, "bytes");
-  ReportResult("ramp-up-padding-sent", padding_sent_, "bytes");
-  ReportResult("ramp-up-rtx-media-sent", rtx_media_sent_, "bytes");
-  ReportResult("ramp-up-total-packets-sent", total_packets_sent_, "packets");
-  ReportResult("ramp-up-padding-packets-sent",
-               padding_packets_sent_,
-               "packets");
-  ReportResult("ramp-up-rtx-packets-sent",
-               rtx_media_packets_sent_,
+void RampUpTester::GetStats(const VideoSendStream::StreamStats& stream,
+                            size_t* total_packets_sent,
+                            size_t* total_sent,
+                            size_t* padding_sent,
+                            size_t* media_sent) const {
+  *total_packets_sent += stream.rtp_stats.transmitted.packets +
+                         stream.rtp_stats.retransmitted.packets +
+                         stream.rtp_stats.fec.packets;
+  *total_sent += stream.rtp_stats.transmitted.TotalBytes() +
+                 stream.rtp_stats.retransmitted.TotalBytes() +
+                 stream.rtp_stats.fec.TotalBytes();
+  *padding_sent += stream.rtp_stats.transmitted.padding_bytes +
+                   stream.rtp_stats.retransmitted.padding_bytes +
+                   stream.rtp_stats.fec.padding_bytes;
+  *media_sent += stream.rtp_stats.MediaPayloadBytes();
+}
+
+void RampUpTester::TriggerTestDone() {
+  VideoSendStream::Stats send_stats = send_stream_->GetStats();
+
+  size_t total_packets_sent = 0;
+  size_t total_sent = 0;
+  size_t padding_sent = 0;
+  size_t media_sent = 0;
+  for (uint32_t ssrc : ssrcs_) {
+    GetStats(send_stats.substreams[ssrc], &total_packets_sent, &total_sent,
+             &padding_sent, &media_sent);
+  }
+
+  size_t rtx_total_packets_sent = 0;
+  size_t rtx_total_sent = 0;
+  size_t rtx_padding_sent = 0;
+  size_t rtx_media_sent = 0;
+  for (uint32_t rtx_ssrc : rtx_ssrcs_) {
+    GetStats(send_stats.substreams[rtx_ssrc], &total_packets_sent, &total_sent,
+             &padding_sent, &media_sent);
+  }
+
+  ReportResult("ramp-up-total-packets-sent", total_packets_sent, "packets");
+  ReportResult("ramp-up-total-sent", total_sent, "bytes");
+  ReportResult("ramp-up-media-sent", media_sent, "bytes");
+  ReportResult("ramp-up-padding-sent", padding_sent, "bytes");
+  ReportResult("ramp-up-rtx-total-packets-sent", rtx_total_packets_sent,
                "packets");
-  ReportResult("ramp-up-time",
-               ramp_up_finished_ms_ - test_start_ms_,
-               "milliseconds");
-  test_done_->Set();
-}
-
-LowRateStreamObserver::LowRateStreamObserver(
-    newapi::Transport* feedback_transport,
-    Clock* clock,
-    size_t number_of_streams,
-    bool rtx_used)
-    : clock_(clock),
-      number_of_streams_(number_of_streams),
-      rtx_used_(rtx_used),
-      test_done_(EventWrapper::Create()),
-      rtp_parser_(RtpHeaderParser::Create()),
-      feedback_transport_(feedback_transport),
-      receive_stats_(ReceiveStatistics::Create(clock)),
-      send_stream_(nullptr),
+  ReportResult("ramp-up-rtx-total-sent", rtx_total_sent, "bytes");
+  ReportResult("ramp-up-rtx-media-sent", rtx_media_sent, "bytes");
+  ReportResult("ramp-up-rtx-padding-sent", rtx_padding_sent, "bytes");
+  if (ramp_up_finished_ms_ >= 0) {
+    ReportResult("ramp-up-time", ramp_up_finished_ms_ - test_start_ms_,
+                 "milliseconds");
+  }
+}
+
+void RampUpTester::PerformTest() {
+  if (Wait() != kEventSignaled) {
+    printf("Timed out while waiting for ramp-up to complete.");
+    return;
+  }
+  TriggerTestDone();
+}
+
+RampUpDownUpTester::RampUpDownUpTester(size_t num_streams,
+                                       unsigned int start_bitrate_bps,
+                                       const std::string& extension_type,
+                                       bool rtx,
+                                       bool red)
+    : RampUpTester(num_streams, start_bitrate_bps, extension_type, rtx, red),
       test_state_(kFirstRampup),
       state_start_ms_(clock_->TimeInMilliseconds()),
-      interval_start_ms_(state_start_ms_),
-      last_remb_bps_(0),
-      sent_bytes_(0),
-      total_overuse_bytes_(0),
-      suspended_in_stats_(false) {
-  RtpRtcp::Configuration config;
-  config.receive_statistics = receive_stats_.get();
-  feedback_transport_.Enable();
-  config.outgoing_transport = &feedback_transport_;
-  rtp_rtcp_.reset(RtpRtcp::CreateRtpRtcp(config));
-  rtp_rtcp_->SetREMBStatus(true);
-  rtp_rtcp_->SetRTCPStatus(kRtcpNonCompound);
-  rtp_parser_->RegisterRtpHeaderExtension(kRtpExtensionAbsoluteSendTime,
-                                          kAbsSendTimeExtensionId);
-  const uint32_t kRemoteBitrateEstimatorMinBitrateBps = 10000;
-  remote_bitrate_estimator_.reset(new RemoteBitrateEstimatorAbsSendTime(
-      this, clock, kRemoteBitrateEstimatorMinBitrateBps));
+      interval_start_ms_(clock_->TimeInMilliseconds()),
+      sent_bytes_(0) {
   forward_transport_config_.link_capacity_kbps =
       kHighBandwidthLimitBps / 1000;
-  forward_transport_config_.queue_length_packets = 100;  // Something large.
-  test::DirectTransport::SetConfig(forward_transport_config_);
-  test::DirectTransport::SetReceiver(this);
+  send_transport_.SetConfig(forward_transport_config_);
 }
 
-void LowRateStreamObserver::SetSendStream(VideoSendStream* send_stream) {
-  rtc::CritScope lock(&crit_);
-  send_stream_ = send_stream;
-}
+RampUpDownUpTester::~RampUpDownUpTester() {}
 
-void LowRateStreamObserver::OnReceiveBitrateChanged(
-    const std::vector<unsigned int>& ssrcs,
-    unsigned int bitrate) {
-  rtc::CritScope lock(&crit_);
-  rtp_rtcp_->SetREMBData(bitrate, ssrcs);
-  rtp_rtcp_->Process();
-  last_remb_bps_ = bitrate;
-}
-
-bool LowRateStreamObserver::SendRtp(const uint8_t* data, size_t length) {
-  rtc::CritScope lock(&crit_);
-  sent_bytes_ += length;
-  int64_t now_ms = clock_->TimeInMilliseconds();
-  if (now_ms > interval_start_ms_ + 1000) {  // Let at least 1 second pass.
-    // Verify that the send rate was about right.
-    unsigned int average_rate_bps = static_cast<unsigned int>(sent_bytes_) *
-                                    8 * 1000 / (now_ms - interval_start_ms_);
-    // TODO(holmer): Why is this failing?
-    // EXPECT_LT(average_rate_bps, last_remb_bps_ * 1.1);
-    if (average_rate_bps > last_remb_bps_ * 1.1) {
-      total_overuse_bytes_ +=
-          sent_bytes_ -
-          last_remb_bps_ / 8 * (now_ms - interval_start_ms_) / 1000;
+bool RampUpDownUpTester::PollStats() {
+  if (send_stream_) {
+    webrtc::VideoSendStream::Stats stats = send_stream_->GetStats();
+    int transmit_bitrate_bps = 0;
+    for (auto it : stats.substreams) {
+      transmit_bitrate_bps += it.second.total_bitrate_bps;
     }
-    EvolveTestState(average_rate_bps);
-    interval_start_ms_ = now_ms;
-    sent_bytes_ = 0;
-  }
-  return test::DirectTransport::SendRtp(data, length);
-}
-
-PacketReceiver::DeliveryStatus LowRateStreamObserver::DeliverPacket(
-    MediaType media_type,
-    const uint8_t* packet,
-    size_t length,
-    const PacketTime& packet_time) {
-  rtc::CritScope lock(&crit_);
-  RTPHeader header;
-  EXPECT_TRUE(rtp_parser_->Parse(packet, length, &header));
-  receive_stats_->IncomingPacket(header, length, false);
-  remote_bitrate_estimator_->IncomingPacket(
-      clock_->TimeInMilliseconds(), length - header.headerLength, header, true);
-  if (remote_bitrate_estimator_->TimeUntilNextProcess() <= 0) {
-    remote_bitrate_estimator_->Process();
+
+    EvolveTestState(transmit_bitrate_bps, stats.suspended);
   }
-  suspended_in_stats_ = send_stream_->GetStats().suspended;
-  return DELIVERY_OK;
+
+  return !event_.Wait(kPollIntervalMs);
 }
 
-bool LowRateStreamObserver::SendRtcp(const uint8_t* packet, size_t length) {
-  return true;
+Call::Config RampUpDownUpTester::GetReceiverCallConfig() {
+  Call::Config config;
+  config.bitrate_config.min_bitrate_bps = 10000;
+  return config;
 }
 
-std::string LowRateStreamObserver::GetModifierString() {
+std::string RampUpDownUpTester::GetModifierString() const {
   std::string str("_");
   char temp_str[5];
-  sprintf(temp_str, "%i",
-      static_cast<int>(number_of_streams_));
+  sprintf(temp_str, "%i", static_cast<int>(num_streams_));
   str += std::string(temp_str);
   str += "stream";
-  str += (number_of_streams_ > 1 ? "s" : "");
+  str += (num_streams_ > 1 ? "s" : "");
   str += "_";
-  str += (rtx_used_ ? "" : "no");
+  str += (rtx_ ? "" : "no");
   str += "rtx";
   return str;
 }
 
-void LowRateStreamObserver::EvolveTestState(unsigned int bitrate_bps) {
+void RampUpDownUpTester::EvolveTestState(int bitrate_bps, bool suspended) {
   int64_t now = clock_->TimeInMilliseconds();
-  rtc::CritScope lock(&crit_);
-  RTC_DCHECK(send_stream_ != nullptr);
   switch (test_state_) {
     case kFirstRampup: {
-      EXPECT_FALSE(suspended_in_stats_);
+      EXPECT_FALSE(suspended);
       if (bitrate_bps > kExpectedHighBitrateBps) {
         // The first ramp-up has reached the target bitrate. Change the
         // channel limit, and move to the next test state.
         forward_transport_config_.link_capacity_kbps =
             kLowBandwidthLimitBps / 1000;
-        test::DirectTransport::SetConfig(forward_transport_config_);
+        send_transport_.SetConfig(forward_transport_config_);
         test_state_ = kLowRate;
         webrtc::test::PrintResult("ramp_up_down_up",
                                   GetModifierString(),
@@ -343,12 +346,12 @@ void LowRateStreamObserver::EvolveTestState(unsigned int bitrate_bps) {
       break;
     }
     case kLowRate: {
-      if (bitrate_bps < kExpectedLowBitrateBps && suspended_in_stats_) {
+      if (bitrate_bps < kExpectedLowBitrateBps && suspended) {
         // The ramp-down was successful. Change the channel limit back to a
         // high value, and move to the next test state.
         forward_transport_config_.link_capacity_kbps =
             kHighBandwidthLimitBps / 1000;
-        test::DirectTransport::SetConfig(forward_transport_config_);
+        send_transport_.SetConfig(forward_transport_config_);
         test_state_ = kSecondRampup;
         webrtc::test::PrintResult("ramp_up_down_up",
                                   GetModifierString(),
@@ -363,299 +366,135 @@ void LowRateStreamObserver::EvolveTestState(unsigned int bitrate_bps) {
       break;
     }
     case kSecondRampup: {
-      if (bitrate_bps > kExpectedHighBitrateBps && !suspended_in_stats_) {
+      if (bitrate_bps > kExpectedHighBitrateBps && !suspended) {
         webrtc::test::PrintResult("ramp_up_down_up",
                                   GetModifierString(),
                                   "second_rampup",
                                   now - state_start_ms_,
                                   "ms",
                                   false);
-        webrtc::test::PrintResult("ramp_up_down_up",
-                                  GetModifierString(),
-                                  "total_overuse",
-                                  total_overuse_bytes_,
-                                  "bytes",
-                                  false);
-        test_done_->Set();
+        observation_complete_->Set();
       }
       break;
     }
   }
 }
 
-EventTypeWrapper LowRateStreamObserver::Wait() {
-  return test_done_->Wait(test::CallTest::kLongTimeoutMs);
-}
-
-class SendBitrateAdapter {
+class RampUpTest : public test::CallTest {
  public:
-  static const int64_t kPollIntervalMs = 250;
-
-  SendBitrateAdapter(const Call& call,
-                     const std::vector<uint32_t>& ssrcs,
-                     RemoteBitrateObserver* bitrate_observer)
-      : event_(false, false),
-        call_(call),
-        ssrcs_(ssrcs),
-        bitrate_observer_(bitrate_observer) {
-    RTC_DCHECK(bitrate_observer != nullptr);
-    poller_thread_ = ThreadWrapper::CreateThread(&SendBitrateAdapterThread,
-                                                 this, "SendBitratePoller");
-    bool thread_start_ok = poller_thread_->Start();
-    RTC_DCHECK(thread_start_ok);
-  }
-
-  virtual ~SendBitrateAdapter() {
-    event_.Set();
-    poller_thread_->Stop();
-  }
+  RampUpTest() {}
 
- private:
-  static bool SendBitrateAdapterThread(void* obj) {
-    return static_cast<SendBitrateAdapter*>(obj)->PollStats();
+  virtual ~RampUpTest() {
+    EXPECT_EQ(nullptr, send_stream_);
+    EXPECT_TRUE(receive_streams_.empty());
   }
-
-  bool PollStats() {
-    Call::Stats stats = call_.GetStats();
-
-    bitrate_observer_->OnReceiveBitrateChanged(ssrcs_,
-                                               stats.send_bandwidth_bps);
-    return !event_.Wait(kPollIntervalMs);
-  }
-
-  rtc::Event event_;
-  rtc::scoped_ptr<ThreadWrapper> poller_thread_;
-  const Call& call_;
-  const std::vector<uint32_t> ssrcs_;
-  RemoteBitrateObserver* const bitrate_observer_;
 };
 
-void RampUpTest::RunRampUpTest(size_t num_streams,
-                               unsigned int start_bitrate_bps,
-                               const std::string& extension_type,
-                               bool rtx,
-                               bool red) {
-  std::vector<uint32_t> ssrcs(GenerateSsrcs(num_streams, 100));
-  std::vector<uint32_t> rtx_ssrcs(GenerateSsrcs(num_streams, 200));
-  StreamObserver::SsrcMap rtx_ssrc_map;
-  if (rtx) {
-    for (size_t i = 0; i < ssrcs.size(); ++i)
-      rtx_ssrc_map[rtx_ssrcs[i]] = ssrcs[i];
-  }
-
-  test::DirectTransport receiver_transport;
-  StreamObserver stream_observer(rtx_ssrc_map, &receiver_transport,
-                                 Clock::GetRealTimeClock());
-
-  CreateSendConfig(num_streams, &stream_observer);
-  send_config_.rtp.extensions.clear();
-
-  rtc::scoped_ptr<SendBitrateAdapter> send_bitrate_adapter_;
-
-  if (extension_type == RtpExtension::kAbsSendTime) {
-    stream_observer.SetRemoteBitrateEstimator(
-        new RemoteBitrateEstimatorAbsSendTime(
-            &stream_observer, Clock::GetRealTimeClock(),
-            kRemoteBitrateEstimatorMinBitrateBps));
-    send_config_.rtp.extensions.push_back(RtpExtension(
-        extension_type.c_str(), kAbsSendTimeExtensionId));
-  } else if (extension_type == RtpExtension::kTransportSequenceNumber) {
-    stream_observer.SetRemoteBitrateEstimator(new RemoteEstimatorProxy(
-        Clock::GetRealTimeClock(), stream_observer.GetPacketRouter()));
-    send_config_.rtp.extensions.push_back(RtpExtension(
-        extension_type.c_str(), kTransportSequenceNumberExtensionId));
-  } else {
-    stream_observer.SetRemoteBitrateEstimator(
-        new RemoteBitrateEstimatorSingleStream(
-            &stream_observer, Clock::GetRealTimeClock(),
-            kRemoteBitrateEstimatorMinBitrateBps));
-    send_config_.rtp.extensions.push_back(RtpExtension(
-        extension_type.c_str(), kTransmissionTimeOffsetExtensionId));
-  }
-
-  Call::Config call_config;
-  if (start_bitrate_bps != 0) {
-    call_config.bitrate_config.start_bitrate_bps = start_bitrate_bps;
-    stream_observer.set_start_bitrate_bps(start_bitrate_bps);
-  }
-  CreateSenderCall(call_config);
-
-  receiver_transport.SetReceiver(sender_call_->Receiver());
-
-  if (num_streams == 1) {
-    encoder_config_.streams[0].target_bitrate_bps = 2000000;
-    encoder_config_.streams[0].max_bitrate_bps = 2000000;
-  }
-
-  send_config_.rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
-  send_config_.rtp.ssrcs = ssrcs;
-  if (rtx) {
-    send_config_.rtp.rtx.payload_type = kSendRtxPayloadType;
-    send_config_.rtp.rtx.ssrcs = rtx_ssrcs;
-  }
-  if (red) {
-    send_config_.rtp.fec.ulpfec_payload_type = kUlpfecPayloadType;
-    send_config_.rtp.fec.red_payload_type = kRedPayloadType;
-  }
-
-  if (num_streams == 1) {
-    // For single stream rampup until 1mbps
-    stream_observer.set_expected_bitrate_bps(kSingleStreamTargetBps);
-  } else {
-    // For multi stream rampup until all streams are being sent. That means
-    // enough birate to send all the target streams plus the min bitrate of
-    // the last one.
-    int expected_bitrate_bps = encoder_config_.streams.back().min_bitrate_bps;
-    for (size_t i = 0; i < encoder_config_.streams.size() - 1; ++i) {
-      expected_bitrate_bps += encoder_config_.streams[i].target_bitrate_bps;
-    }
-    stream_observer.set_expected_bitrate_bps(expected_bitrate_bps);
-  }
-
-  CreateStreams();
-  CreateFrameGeneratorCapturer();
-
-  if (extension_type == RtpExtension::kTransportSequenceNumber) {
-    send_bitrate_adapter_.reset(
-        new SendBitrateAdapter(*sender_call_.get(), ssrcs, &stream_observer));
-  }
-  Start();
-
-  EXPECT_EQ(kEventSignaled, stream_observer.Wait());
-
-  // Destroy the SendBitrateAdapter (if any) to stop the poller thread in it,
-  // otherwise we might get a data race with the destruction of the call.
-  send_bitrate_adapter_.reset();
-
-  Stop();
-  DestroyStreams();
-}
-
-void RampUpTest::RunRampUpDownUpTest(size_t number_of_streams,
-                                     bool rtx,
-                                     bool red) {
-  test::DirectTransport receiver_transport;
-  LowRateStreamObserver stream_observer(
-      &receiver_transport, Clock::GetRealTimeClock(), number_of_streams, rtx);
-
-  Call::Config call_config;
-  call_config.bitrate_config.start_bitrate_bps = 60000;
-  CreateSenderCall(call_config);
-  receiver_transport.SetReceiver(sender_call_->Receiver());
-
-  CreateSendConfig(number_of_streams, &stream_observer);
-
-  send_config_.rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
-  send_config_.rtp.extensions.push_back(RtpExtension(
-      RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId));
-  send_config_.suspend_below_min_bitrate = true;
-
-  if (rtx) {
-    send_config_.rtp.rtx.payload_type = kSendRtxPayloadType;
-    send_config_.rtp.rtx.ssrcs = GenerateSsrcs(number_of_streams, 200);
-  }
-  if (red) {
-    send_config_.rtp.fec.ulpfec_payload_type = kUlpfecPayloadType;
-    send_config_.rtp.fec.red_payload_type = kRedPayloadType;
-  }
-
-  CreateStreams();
-  stream_observer.SetSendStream(send_stream_);
-
-  CreateFrameGeneratorCapturer();
-
-  Start();
-
-  EXPECT_EQ(kEventSignaled, stream_observer.Wait());
-
-  Stop();
-  DestroyStreams();
-}
-
 TEST_F(RampUpTest, SingleStream) {
-  RunRampUpTest(1, 0, RtpExtension::kTOffset, false, false);
+  RampUpTester test(1, 0, RtpExtension::kTOffset, false, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, Simulcast) {
-  RunRampUpTest(3, 0, RtpExtension::kTOffset, false, false);
+  RampUpTester test(3, 0, RtpExtension::kTOffset, false, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, SimulcastWithRtx) {
-  RunRampUpTest(3, 0, RtpExtension::kTOffset, true, false);
+  RampUpTester test(3, 0, RtpExtension::kTOffset, true, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, SimulcastByRedWithRtx) {
-  RunRampUpTest(3, 0, RtpExtension::kTOffset, true, true);
+  RampUpTester test(3, 0, RtpExtension::kTOffset, true, true);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, SingleStreamWithHighStartBitrate) {
-  RunRampUpTest(1, 0.9 * kSingleStreamTargetBps, RtpExtension::kTOffset, false,
-                false);
+  RampUpTester test(1, 0.9 * kSingleStreamTargetBps, RtpExtension::kTOffset,
+                    false, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, UpDownUpOneStream) {
-  RunRampUpDownUpTest(1, false, false);
+  RampUpDownUpTester test(1, 60000, RtpExtension::kAbsSendTime, false, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, UpDownUpThreeStreams) {
-  RunRampUpDownUpTest(3, false, false);
+  RampUpDownUpTester test(3, 60000, RtpExtension::kAbsSendTime, false, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, UpDownUpOneStreamRtx) {
-  RunRampUpDownUpTest(1, true, false);
+  RampUpDownUpTester test(1, 60000, RtpExtension::kAbsSendTime, true, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, UpDownUpThreeStreamsRtx) {
-  RunRampUpDownUpTest(3, true, false);
+  RampUpDownUpTester test(3, 60000, RtpExtension::kAbsSendTime, true, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, UpDownUpOneStreamByRedRtx) {
-  RunRampUpDownUpTest(1, true, true);
+  RampUpDownUpTester test(1, 60000, RtpExtension::kAbsSendTime, true, true);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, UpDownUpThreeStreamsByRedRtx) {
-  RunRampUpDownUpTest(3, true, true);
+  RampUpDownUpTester test(3, 60000, RtpExtension::kAbsSendTime, true, true);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, AbsSendTimeSingleStream) {
-  RunRampUpTest(1, 0, RtpExtension::kAbsSendTime, false, false);
+  RampUpTester test(1, 0, RtpExtension::kAbsSendTime, false, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, AbsSendTimeSimulcast) {
-  RunRampUpTest(3, 0, RtpExtension::kAbsSendTime, false, false);
+  RampUpTester test(3, 0, RtpExtension::kAbsSendTime, false, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, AbsSendTimeSimulcastWithRtx) {
-  RunRampUpTest(3, 0, RtpExtension::kAbsSendTime, true, false);
+  RampUpTester test(3, 0, RtpExtension::kAbsSendTime, true, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, AbsSendTimeSimulcastByRedWithRtx) {
-  RunRampUpTest(3, 0, RtpExtension::kAbsSendTime, true, true);
+  RampUpTester test(3, 0, RtpExtension::kAbsSendTime, true, true);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, AbsSendTimeSingleStreamWithHighStartBitrate) {
-  RunRampUpTest(1, 0.9 * kSingleStreamTargetBps, RtpExtension::kAbsSendTime,
-                false, false);
+  RampUpTester test(1, 0.9 * kSingleStreamTargetBps, RtpExtension::kAbsSendTime,
+                    false, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, TransportSequenceNumberSingleStream) {
-  RunRampUpTest(1, 0, RtpExtension::kTransportSequenceNumber, false, false);
+  RampUpTester test(1, 0, RtpExtension::kTransportSequenceNumber, false, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, TransportSequenceNumberSimulcast) {
-  RunRampUpTest(3, 0, RtpExtension::kTransportSequenceNumber, false, false);
+  RampUpTester test(3, 0, RtpExtension::kTransportSequenceNumber, false, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, TransportSequenceNumberSimulcastWithRtx) {
-  RunRampUpTest(3, 0, RtpExtension::kTransportSequenceNumber, true, false);
+  RampUpTester test(3, 0, RtpExtension::kTransportSequenceNumber, true, false);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, TransportSequenceNumberSimulcastByRedWithRtx) {
-  RunRampUpTest(3, 0, RtpExtension::kTransportSequenceNumber, true, true);
+  RampUpTester test(3, 0, RtpExtension::kTransportSequenceNumber, true, true);
+  RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, TransportSequenceNumberSingleStreamWithHighStartBitrate) {
-  RunRampUpTest(1, 0.9 * kSingleStreamTargetBps,
-                RtpExtension::kTransportSequenceNumber, false, false);
+  RampUpTester test(1, 0.9 * kSingleStreamTargetBps,
+                    RtpExtension::kTransportSequenceNumber, false, false);
+  RunBaseTest(&test);
 }
 }  // namespace webrtc