Revert of Move delay_based_bwe_ into CongestionController

webrtc/modules/congestion_controller/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.
  */
 
@@ skipping 142 matching lines @@
 
 CongestionController::CongestionController(
     Clock* clock,
     Observer* observer,
     RemoteBitrateObserver* remote_bitrate_observer,
     RtcEventLog* event_log,
     PacketRouter* packet_router,
     std::unique_ptr<PacedSender> pacer)
     : clock_(clock),
       observer_(observer),
-      event_log_(event_log),
       packet_router_(packet_router),
       pacer_(std::move(pacer)),
       bitrate_controller_(
           BitrateController::CreateBitrateController(clock_, event_log)),
       probe_controller_(new ProbeController(pacer_.get(), clock_)),
       retransmission_rate_limiter_(
           new RateLimiter(clock, kRetransmitWindowSizeMs)),
       remote_bitrate_estimator_(remote_bitrate_observer, clock_),
       remote_estimator_proxy_(clock_, packet_router_),
-      transport_feedback_adapter_(clock_),
+      transport_feedback_adapter_(event_log, clock_, bitrate_controller_.get()),
       min_bitrate_bps_(congestion_controller::GetMinBitrateBps()),
       max_bitrate_bps_(0),
       last_reported_bitrate_bps_(0),
       last_reported_fraction_loss_(0),
       last_reported_rtt_(0),
-      network_state_(kNetworkUp),
-      delay_based_bwe_(new DelayBasedBwe(event_log_, clock_)) {
-  delay_based_bwe_->SetMinBitrate(min_bitrate_bps_);
-  worker_thread_checker_.DetachFromThread();
+      network_state_(kNetworkUp) {
+  transport_feedback_adapter_.InitBwe();
+  transport_feedback_adapter_.SetMinBitrate(min_bitrate_bps_);
 }
 
 CongestionController::~CongestionController() {}
 
 void CongestionController::OnReceivedPacket(int64_t arrival_time_ms,
                                             size_t payload_size,
                                             const RTPHeader& header) {
   // Send-side BWE.
   if (header.extension.hasTransportSequenceNumber) {
     remote_estimator_proxy_.IncomingPacket(arrival_time_ms, payload_size,
@@ skipping 12 matching lines @@
   bitrate_controller_->SetBitrates(start_bitrate_bps,
                                    min_bitrate_bps,
                                    max_bitrate_bps);
 
   probe_controller_->SetBitrates(min_bitrate_bps, start_bitrate_bps,
                                  max_bitrate_bps);
   max_bitrate_bps_ = max_bitrate_bps;
 
   remote_bitrate_estimator_.SetMinBitrate(min_bitrate_bps);
   min_bitrate_bps_ = min_bitrate_bps;
-  {
-    rtc::CritScope cs(&bwe_lock_);
-    if (start_bitrate_bps > 0)
-      delay_based_bwe_->SetStartBitrate(start_bitrate_bps);
-    delay_based_bwe_->SetMinBitrate(min_bitrate_bps_);
-  }
+  if (start_bitrate_bps > 0)
+    transport_feedback_adapter_.SetStartBitrate(start_bitrate_bps);
+  transport_feedback_adapter_.SetMinBitrate(min_bitrate_bps_);
   MaybeTriggerOnNetworkChanged();
 }
 
 void CongestionController::ResetBweAndBitrates(int bitrate_bps,
                                                int min_bitrate_bps,
                                                int max_bitrate_bps) {
   ClampBitrates(&bitrate_bps, &min_bitrate_bps, &max_bitrate_bps);
   // TODO(honghaiz): Recreate this object once the bitrate controller is
   // no longer exposed outside CongestionController.
   bitrate_controller_->ResetBitrates(bitrate_bps, min_bitrate_bps,
                                      max_bitrate_bps);
   min_bitrate_bps_ = min_bitrate_bps;
   max_bitrate_bps_ = max_bitrate_bps;
   // TODO(honghaiz): Recreate this object once the remote bitrate estimator is
   // no longer exposed outside CongestionController.
   remote_bitrate_estimator_.SetMinBitrate(min_bitrate_bps);
 
   transport_feedback_adapter_.ClearSendTimeHistory();
-  {
-    rtc::CritScope cs(&bwe_lock_);
-    delay_based_bwe_.reset(new DelayBasedBwe(event_log_, clock_));
-    delay_based_bwe_->SetStartBitrate(bitrate_bps);
-    delay_based_bwe_->SetMinBitrate(min_bitrate_bps);
-  }
+  transport_feedback_adapter_.InitBwe();
+  transport_feedback_adapter_.SetStartBitrate(bitrate_bps);
+  transport_feedback_adapter_.SetMinBitrate(min_bitrate_bps);
 
   probe_controller_->Reset();
   probe_controller_->SetBitrates(min_bitrate_bps, bitrate_bps, max_bitrate_bps);
 
   MaybeTriggerOnNetworkChanged();
 }
 
 BitrateController* CongestionController::GetBitrateController() const {
   return bitrate_controller_.get();
 }
 
 RemoteBitrateEstimator* CongestionController::GetRemoteBitrateEstimator(
     bool send_side_bwe) {
   if (send_side_bwe) {
     return &remote_estimator_proxy_;
   } else {
     return &remote_bitrate_estimator_;
   }
 }
 
+TransportFeedbackObserver*
+CongestionController::GetTransportFeedbackObserver() {
+  return &transport_feedback_adapter_;
+}
+
 RateLimiter* CongestionController::GetRetransmissionRateLimiter() {
   return retransmission_rate_limiter_.get();
 }
 
 void CongestionController::EnablePeriodicAlrProbing(bool enable) {
   probe_controller_->EnablePeriodicAlrProbing(enable);
 }
 
 void CongestionController::SetAllocatedSendBitrateLimits(
     int min_send_bitrate_bps,
     int max_padding_bitrate_bps) {
   pacer_->SetSendBitrateLimits(min_send_bitrate_bps, max_padding_bitrate_bps);
 }
 
 int64_t CongestionController::GetPacerQueuingDelayMs() const {
   return IsNetworkDown() ? 0 : pacer_->QueueInMs();
 }
 
 void CongestionController::SignalNetworkState(NetworkState state) {
   LOG(LS_INFO) << "SignalNetworkState "
                << (state == kNetworkUp ? "Up" : "Down");
   if (state == kNetworkUp) {
     pacer_->Resume();
   } else {
     pacer_->Pause();
   }
   {
-    rtc::CritScope cs(&network_state_lock_);
+    rtc::CritScope cs(&critsect_);
     network_state_ = state;
   }
   probe_controller_->OnNetworkStateChanged(state);
   MaybeTriggerOnNetworkChanged();
 }
 
 void CongestionController::SetTransportOverhead(
     size_t transport_overhead_bytes_per_packet) {
   transport_feedback_adapter_.SetTransportOverhead(
       transport_overhead_bytes_per_packet);
 }
 
 void CongestionController::OnSentPacket(const rtc::SentPacket& sent_packet) {
   // We're not interested in packets without an id, which may be stun packets,
   // etc, sent on the same transport.
   if (sent_packet.packet_id == -1)
     return;
   transport_feedback_adapter_.OnSentPacket(sent_packet.packet_id,
                                            sent_packet.send_time_ms);
 }
 
 void CongestionController::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) {
   remote_bitrate_estimator_.OnRttUpdate(avg_rtt_ms, max_rtt_ms);
-  {
-    rtc::CritScope cs(&bwe_lock_);
-    delay_based_bwe_->OnRttUpdate(avg_rtt_ms, max_rtt_ms);
-  }
+  transport_feedback_adapter_.OnRttUpdate(avg_rtt_ms, max_rtt_ms);
 }
 
 int64_t CongestionController::TimeUntilNextProcess() {
   return std::min(bitrate_controller_->TimeUntilNextProcess(),
                   remote_bitrate_estimator_.TimeUntilNextProcess());
 }
 
 void CongestionController::Process() {
   bitrate_controller_->Process();
   remote_bitrate_estimator_.Process();
   probe_controller_->Process();
   MaybeTriggerOnNetworkChanged();
 }
 
-void CongestionController::AddPacket(uint16_t sequence_number,
-                                     size_t length,
-                                     const PacedPacketInfo& pacing_info) {
-  transport_feedback_adapter_.AddPacket(sequence_number, length, pacing_info);
-}
-
-void CongestionController::OnTransportFeedback(
-    const rtcp::TransportFeedback& feedback) {
-  RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
-  transport_feedback_adapter_.OnTransportFeedback(feedback);
-  DelayBasedBwe::Result result;
-  {
-    rtc::CritScope cs(&bwe_lock_);
-    result = delay_based_bwe_->IncomingPacketFeedbackVector(
-        transport_feedback_adapter_.GetTransportFeedbackVector());
-  }
-  if (result.updated)
-    bitrate_controller_->OnDelayBasedBweResult(result);
-}
-
-std::vector<PacketFeedback> CongestionController::GetTransportFeedbackVector()
-    const {
-  RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
-  return transport_feedback_adapter_.GetTransportFeedbackVector();
-}
-
 void CongestionController::MaybeTriggerOnNetworkChanged() {
   // TODO(perkj): |observer_| can be nullptr if the ctor that accepts a
   // BitrateObserver is used. Remove this check once the ctor is removed.
   if (!observer_)
     return;
 
   uint32_t bitrate_bps;
   uint8_t fraction_loss;
   int64_t rtt;
   bool estimate_changed = bitrate_controller_->GetNetworkParameters(
       &bitrate_bps, &fraction_loss, &rtt);
   if (estimate_changed) {
     pacer_->SetEstimatedBitrate(bitrate_bps);
     probe_controller_->SetEstimatedBitrate(bitrate_bps);
     retransmission_rate_limiter_->SetMaxRate(bitrate_bps);
   }
 
   bitrate_bps = IsNetworkDown() || IsSendQueueFull() ? 0 : bitrate_bps;
 
   if (HasNetworkParametersToReportChanged(bitrate_bps, fraction_loss, rtt)) {
-    int64_t probing_interval_ms;
-    {
-      rtc::CritScope cs(&bwe_lock_);
-      probing_interval_ms = delay_based_bwe_->GetProbingIntervalMs();
-    }
-    observer_->OnNetworkChanged(bitrate_bps, fraction_loss, rtt,
-                                probing_interval_ms);
+    observer_->OnNetworkChanged(
+        bitrate_bps, fraction_loss, rtt,
+        transport_feedback_adapter_.GetProbingIntervalMs());
     remote_estimator_proxy_.OnBitrateChanged(bitrate_bps);
   }
 }
 
 bool CongestionController::HasNetworkParametersToReportChanged(
     uint32_t bitrate_bps,
     uint8_t fraction_loss,
     int64_t rtt) {
-  rtc::CritScope cs(&network_state_lock_);
+  rtc::CritScope cs(&critsect_);
   bool changed =
       last_reported_bitrate_bps_ != bitrate_bps ||
       (bitrate_bps > 0 && (last_reported_fraction_loss_ != fraction_loss ||
                            last_reported_rtt_ != rtt));
   if (changed && (last_reported_bitrate_bps_ == 0 || bitrate_bps == 0)) {
     LOG(LS_INFO) << "Bitrate estimate state changed, BWE: " << bitrate_bps
                  << " bps.";
   }
   last_reported_bitrate_bps_ = bitrate_bps;
   last_reported_fraction_loss_ = fraction_loss;
   last_reported_rtt_ = rtt;
   return changed;
 }
 
 bool CongestionController::IsSendQueueFull() const {
   return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs;
 }
 
 bool CongestionController::IsNetworkDown() const {
-  rtc::CritScope cs(&network_state_lock_);
+  rtc::CritScope cs(&critsect_);
   return network_state_ == kNetworkDown;
 }
 
 }  // namespace webrtc