Update bitrate only when we have incoming packet.

webrtc/call/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.
  */
 
 #include "webrtc/call/congestion_controller.h"
 
+#include <algorithm>
 #include <vector>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/socket.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
@@ skipping 52 matching lines @@
     CriticalSectionScoped cs(crit_sect_.get());
     rbe_->RemoveStream(ssrc);
   }
 
   bool LatestEstimate(std::vector<unsigned int>* ssrcs,
                       unsigned int* bitrate_bps) const override {
     CriticalSectionScoped cs(crit_sect_.get());
     return rbe_->LatestEstimate(ssrcs, bitrate_bps);
   }
 
-  bool GetStats(ReceiveBandwidthEstimatorStats* output) const override {
-    CriticalSectionScoped cs(crit_sect_.get());
-    return rbe_->GetStats(output);
-  }
-
   void SetMinBitrate(int min_bitrate_bps) {
     CriticalSectionScoped cs(crit_sect_.get());
     rbe_->SetMinBitrate(min_bitrate_bps);
     min_bitrate_bps_ = min_bitrate_bps;
   }
 
  private:
   void PickEstimatorFromHeader(const RTPHeader& header)
       EXCLUSIVE_LOCKS_REQUIRED(crit_sect_.get()) {
     if (header.extension.hasAbsoluteSendTime) {
@@ skipping 86 matching lines @@
   process_thread_->DeRegisterModule(remote_bitrate_estimator_.get());
   call_stats_->DeregisterStatsObserver(remote_bitrate_estimator_.get());
   if (transport_feedback_adapter_.get())
     call_stats_->DeregisterStatsObserver(transport_feedback_adapter_.get());
 }
 
 
 void CongestionController::SetBweBitrates(int min_bitrate_bps,
                                           int start_bitrate_bps,
                                           int max_bitrate_bps) {
-  if (start_bitrate_bps > 0)
+  // TODO(holmer): We should make sure the default bitrates are set to 10 kbps,
+  // and that we don't try to set the min bitrate to 0 from any applications.
+  // The congestion controller should allow a min bitrate of 0.
+  const int kMinBitrateBps = 10000;
+  if (min_bitrate_bps < kMinBitrateBps)
+    min_bitrate_bps = kMinBitrateBps;
+  if (max_bitrate_bps > 0)
+    max_bitrate_bps = std::max(min_bitrate_bps, max_bitrate_bps);
+  if (start_bitrate_bps > 0) {
+    start_bitrate_bps = std::max(min_bitrate_bps, start_bitrate_bps);
     bitrate_controller_->SetStartBitrate(start_bitrate_bps);
+  }
   bitrate_controller_->SetMinMaxBitrate(min_bitrate_bps, max_bitrate_bps);
   if (remote_bitrate_estimator_.get())
     remote_bitrate_estimator_->SetMinBitrate(min_bitrate_bps);
   if (transport_feedback_adapter_.get())
     transport_feedback_adapter_->GetBitrateEstimator()->SetMinBitrate(
         min_bitrate_bps);
   min_bitrate_bps_ = min_bitrate_bps;
 }
 
 BitrateController* CongestionController::GetBitrateController() const {
@@ skipping 42 matching lines @@
   }
 }
 
 void CongestionController::OnSentPacket(const rtc::SentPacket& sent_packet) {
   if (transport_feedback_adapter_) {
     transport_feedback_adapter_->OnSentPacket(sent_packet.packet_id,
                                               sent_packet.send_time_ms);
   }
 }
 }  // namespace webrtc