Remove SendPacer from ViEEncoder

webrtc/call/bitrate_allocator.cc

 /*
  *  Copyright (c) 2015 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 13 matching lines @@
 const int kDefaultBitrateBps = 300000;
 
 BitrateAllocator::BitrateAllocator()
     : bitrate_observers_(),
       bitrate_observers_modified_(false),
       enforce_min_bitrate_(true),
       last_bitrate_bps_(kDefaultBitrateBps),
       last_fraction_loss_(0),
       last_rtt_(0) {}
 
-uint32_t BitrateAllocator::OnNetworkChanged(uint32_t bitrate,
-                                            uint8_t fraction_loss,
-                                            int64_t rtt) {
+void BitrateAllocator::OnNetworkChanged(uint32_t bitrate,

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

Is there a point in changing this method?

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

Reverting as discussed.

+                                        uint8_t fraction_loss,
+                                        int64_t rtt) {
   rtc::CritScope lock(&crit_sect_);
   last_bitrate_bps_ = bitrate;
   last_fraction_loss_ = fraction_loss;
   last_rtt_ = rtt;
-  uint32_t allocated_bitrate_bps = 0;
   ObserverBitrateMap allocation = AllocateBitrates();
   for (const auto& kv : allocation) {
     kv.first->OnBitrateUpdated(kv.second, last_fraction_loss_, last_rtt_);
-    allocated_bitrate_bps += kv.second;
   }
-  return allocated_bitrate_bps;
 }
 
 BitrateAllocator::ObserverBitrateMap BitrateAllocator::AllocateBitrates() {
   if (bitrate_observers_.empty())
     return ObserverBitrateMap();
 
   uint32_t sum_min_bitrates = 0;
   for (const auto& observer : bitrate_observers_)
     sum_min_bitrates += observer.second.min_bitrate;
-  if (last_bitrate_bps_ <= sum_min_bitrates)
+  if (last_bitrate_bps_ == 0)
+    return ZeroRateAllocation();
+  else if (last_bitrate_bps_ <= sum_min_bitrates)
     return LowRateAllocation(last_bitrate_bps_);
   else
     return NormalRateAllocation(last_bitrate_bps_, sum_min_bitrates);
 }
 
 int BitrateAllocator::AddObserver(BitrateAllocatorObserver* observer,
                                   uint32_t min_bitrate_bps,
                                   uint32_t max_bitrate_bps) {
   rtc::CritScope lock(&crit_sect_);
 
@@ skipping 29 matching lines @@
 void BitrateAllocator::RemoveObserver(BitrateAllocatorObserver* observer) {
   rtc::CritScope lock(&crit_sect_);
   BitrateObserverConfList::iterator it =
       FindObserverConfigurationPair(observer);
   if (it != bitrate_observers_.end()) {
     bitrate_observers_.erase(it);
     bitrate_observers_modified_ = true;
   }
 }
 
-void BitrateAllocator::GetMinMaxBitrateSumBps(int* min_bitrate_sum_bps,
-                                              int* max_bitrate_sum_bps) const {
-  *min_bitrate_sum_bps = 0;
-  *max_bitrate_sum_bps = 0;
+int BitrateAllocator::GetMinSendBitrate() const {
+  rtc::CritScope lock(&crit_sect_);
+  int min_bitrate = 0;
 
-  rtc::CritScope lock(&crit_sect_);
+  if (!enforce_min_bitrate_)
+    return 0;
+
   for (const auto& observer : bitrate_observers_) {
-    *min_bitrate_sum_bps += observer.second.min_bitrate;
-    *max_bitrate_sum_bps += observer.second.max_bitrate;
+    min_bitrate += observer.second.min_bitrate;
   }
+  return min_bitrate;
 }
 
 BitrateAllocator::BitrateObserverConfList::iterator
 BitrateAllocator::FindObserverConfigurationPair(
     const BitrateAllocatorObserver* observer) {
   for (auto it = bitrate_observers_.begin(); it != bitrate_observers_.end();
        ++it) {
     if (it->first == observer)
       return it;
   }
@@ skipping 36 matching lines @@
     } else {
       allocation[max_it->second.observer] = observer_allowance;
     }
     list_max_bitrates.erase(max_it);
     // Prepare next iteration.
     max_it = list_max_bitrates.begin();
   }
   return allocation;
 }
 
+BitrateAllocator::ObserverBitrateMap BitrateAllocator::ZeroRateAllocation() {
+  ObserverBitrateMap allocation;
+  // Zero bitrate to all observers.
+  for (const auto& observer : bitrate_observers_)
+    allocation[observer.first] = 0;
+  return allocation;
+}
+
 BitrateAllocator::ObserverBitrateMap BitrateAllocator::LowRateAllocation(
     uint32_t bitrate) {
   ObserverBitrateMap allocation;
   if (enforce_min_bitrate_) {
     // Min bitrate to all observers.
     for (const auto& observer : bitrate_observers_)
       allocation[observer.first] = observer.second.min_bitrate;
   } else {
     // Allocate up to |min_bitrate| to one observer at a time, until
     // |bitrate| is depleted.
     uint32_t remainder = bitrate;
     for (const auto& observer : bitrate_observers_) {
       uint32_t allocated_bitrate =
           std::min(remainder, observer.second.min_bitrate);
       allocation[observer.first] = allocated_bitrate;
       remainder -= allocated_bitrate;
     }
   }
   return allocation;
 }
 }  // namespace webrtc