Remove SendPacer from ViEEncoder

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.
  *
  */
 
 #include "webrtc/modules/bitrate_controller/bitrate_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 
 namespace webrtc {
 
 class BitrateControllerImpl::RtcpBandwidthObserverImpl
     : public RtcpBandwidthObserver {
  public:
   explicit RtcpBandwidthObserverImpl(BitrateControllerImpl* owner)
       : owner_(owner) {
   }
@@ skipping 44 matching lines @@
                                          total_number_of_packets, now_ms);
   }
 
  private:
   std::map<uint32_t, uint32_t> ssrc_to_last_received_extended_high_seq_num_;
   BitrateControllerImpl* owner_;
 };
 
 BitrateController* BitrateController::CreateBitrateController(
     Clock* clock,
-    BitrateObserver* observer) {
-  return new BitrateControllerImpl(clock, observer);
+    BitrateObserver* observer,
+    PacedSender* pacer) {
+  return new BitrateControllerImpl(clock, observer, pacer);
 }
 
 BitrateControllerImpl::BitrateControllerImpl(Clock* clock,
-                                             BitrateObserver* observer)
+                                             BitrateObserver* observer,
+                                             PacedSender* pacer)
     : 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) {
+      last_reserved_bitrate_bps_(0),
+      send_queue_full_(false) {
+  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() {
   return new RtcpBandwidthObserverImpl(this);
 }
@@ skipping 73 matching lines @@
     int64_t now_ms) {
   {
     rtc::CritScope cs(&critsect_);
     bandwidth_estimation_.UpdateReceiverBlock(fraction_loss, rtt,
                                               number_of_packets, now_ms);
   }
   MaybeTriggerOnNetworkChanged();
 }
 
 void BitrateControllerImpl::MaybeTriggerOnNetworkChanged() {
-  uint32_t bitrate;
+  uint32_t bitrate_bps;
   uint8_t fraction_loss;
   int64_t rtt;
-  if (GetNetworkParameters(&bitrate, &fraction_loss, &rtt))
-    observer_->OnNetworkChanged(bitrate, fraction_loss, rtt);
+
+  bool network_changed =
+      GetNetworkParameters(&bitrate_bps, &fraction_loss, &rtt);
+  if (network_changed) {
+    pacer_->SetNetWorkEstimateTargetBitrate(bitrate_bps);

[stefan-webrtc, 2016/04/29 10:48:38]

I'd prefer keeping this in OnNetworkChanged and not have a dependency from
BitrateController on Pacer. I think this is harder to follow than before when
the pacer bitrates were updated in one place.

[perkj_webrtc, 2016/05/02 11:29:10]

ok- as discussed.

+  }
+  bool send_queue_full =
+      pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs;
+
+  bitrate_bps = send_queue_full ? 0 : bitrate_bps;
+  if (UpdateSendQueueStatus(send_queue_full) ||
+      (network_changed && !send_queue_full)) {
+    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;
   bandwidth_estimation_.CurrentEstimate(&current_bitrate, fraction_loss, rtt);
   *bitrate = current_bitrate;
   *bitrate -= std::min(*bitrate, reserved_bitrate_bps_);
   *bitrate =
       std::max<uint32_t>(*bitrate, bandwidth_estimation_.GetMinBitrate());
 
   bool new_bitrate = false;
   if (*bitrate != last_bitrate_bps_ || *fraction_loss != last_fraction_loss_ ||
       *rtt != last_rtt_ms_ ||
       last_reserved_bitrate_bps_ != reserved_bitrate_bps_) {
     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) {
+  rtc::CritScope cs(&critsect_);
+  bool changed = is_full != send_queue_full_;
+  send_queue_full_ = is_full;
+  if (changed) {
+    LOG(LS_INFO) << "Send queue status changed state. "
+                 << " Queue is " << (changed ? "full" : "not full.");
+  }
+  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