Remove ViEEncoder::SetNetworkStatus

webrtc/modules/bitrate_controller/bitrate_controller_impl.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 81 matching lines @@
     : clock_(clock),
       observer_(observer),
       pacer_(pacer),
       last_bitrate_update_ms_(clock_->TimeInMilliseconds()),
       bandwidth_estimation_(),
       reserved_bitrate_bps_(0),
       last_bitrate_bps_(0),
       last_fraction_loss_(0),
       last_rtt_ms_(0),
       last_reserved_bitrate_bps_(0),
-      send_queue_full_(false) {
+      send_queue_ready_(true) {
   RTC_DCHECK(observer_);
   RTC_DCHECK(pacer_);
   // This calls the observer_, which means that the observer provided by the
   // user must be ready to accept a bitrate update when it constructs the
   // controller. We do this to avoid having to keep synchronized initial values
   // in both the controller and the allocator.
   MaybeTriggerOnNetworkChanged();
 }
 
 RtcpBandwidthObserver* BitrateControllerImpl::CreateRtcpBandwidthObserver() {
@@ skipping 84 matching lines @@
 void BitrateControllerImpl::MaybeTriggerOnNetworkChanged() {
   uint32_t bitrate_bps;
   uint8_t fraction_loss;
   int64_t rtt;
 
   bool network_changed =
       GetNetworkParameters(&bitrate_bps, &fraction_loss, &rtt);
   if (network_changed) {
     pacer_->SetNetWorkEstimateTargetBitrate(bitrate_bps);
   }
-  bool send_queue_full =
-      pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs;
+  bool send_queue_ready = pacer_->CanSendMorePackets();
 
-  bitrate_bps = send_queue_full ? 0 : bitrate_bps;
-  if (UpdateSendQueueStatus(send_queue_full) ||
-      (network_changed && !send_queue_full)) {
+  bitrate_bps = send_queue_ready ? bitrate_bps : 0;
+  if (UpdateSendQueueStatus(send_queue_ready) ||
+      (network_changed && send_queue_ready)) {
     observer_->OnNetworkChanged(bitrate_bps, fraction_loss, rtt);
     return;
   }
 }
 
 bool BitrateControllerImpl::GetNetworkParameters(uint32_t* bitrate,
                                                  uint8_t* fraction_loss,
                                                  int64_t* rtt) {
   rtc::CritScope cs(&critsect_);
   int current_bitrate;
@@ skipping 10 matching lines @@
     last_bitrate_bps_ = *bitrate;
     last_fraction_loss_ = *fraction_loss;
     last_rtt_ms_ = *rtt;
     last_reserved_bitrate_bps_ = reserved_bitrate_bps_;
     new_bitrate = true;
   }
 
   return new_bitrate;
 }
 
-bool BitrateControllerImpl::UpdateSendQueueStatus(bool is_full) {
+bool BitrateControllerImpl::UpdateSendQueueStatus(bool is_ready) {
   rtc::CritScope cs(&critsect_);
-  bool changed = is_full != send_queue_full_;
-  send_queue_full_ = is_full;
+  bool changed = is_ready != send_queue_ready_;
+  send_queue_ready_ = is_ready;
   if (changed) {
     LOG(LS_INFO) << "Send queue status changed state. "
-                 << " Queue is " << (changed ? "full" : "not full.");
+                 << " Queue is "
+                 << (send_queue_ready_ ? "ready." : " not ready.");
   }
   return changed;
 }
 
 bool BitrateControllerImpl::AvailableBandwidth(uint32_t* bandwidth) const {
   rtc::CritScope cs(&critsect_);
   int bitrate;
   uint8_t fraction_loss;
   int64_t rtt;
   bandwidth_estimation_.CurrentEstimate(&bitrate, &fraction_loss, &rtt);
   if (bitrate > 0) {
     bitrate = bitrate - std::min<int>(bitrate, reserved_bitrate_bps_);
     bitrate = std::max(bitrate, bandwidth_estimation_.GetMinBitrate());
     *bandwidth = bitrate;
     return true;
   }
   return false;
 }
 }  // namespace webrtc