Move BWE period calculation from ProbingIntervalEstimator to AimdRateControl.

webrtc/modules/congestion_controller/send_side_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 75 matching lines @@
 void SendSideCongestionController::RegisterPacketFeedbackObserver(
     PacketFeedbackObserver* observer) {
   transport_feedback_adapter_.RegisterPacketFeedbackObserver(observer);
 }
 
 void SendSideCongestionController::DeRegisterPacketFeedbackObserver(
     PacketFeedbackObserver* observer) {
   transport_feedback_adapter_.DeRegisterPacketFeedbackObserver(observer);
 }
 
 void SendSideCongestionController::RegisterNetworkObserver(Observer* observer) {

[michaelt, 2017/04/05 07:06:02]

This change seams unrelated with the topic of the CL. 

[terelius, 2017/04/05 10:58:03]

Huh? There is no change in
SendSideCongestionController::RegisterNetworkObserver.

[michaelt, 2017/04/06 11:35:13]

Hmm this is probably shown to me because you rebased ?

[terelius, 2017/04/07 11:55:03]

Does this really show up as modified in codereview.webrtc.org for you? While a
rebase could cause things to show up as modified, I think
RegisterNetworkObserver was landed before I created the branch. In any case, the
codereview should not be account dependent and neither I nor minyue see this as
modified.

   rtc::CritScope cs(&observer_lock_);
   RTC_DCHECK(observer_ == nullptr);
   observer_ = observer;
 }
 
 void SendSideCongestionController::DeRegisterNetworkObserver(
     Observer* observer) {
   rtc::CritScope cs(&observer_lock_);
   RTC_DCHECK_EQ(observer_, observer);
   observer_ = nullptr;
@@ skipping 161 matching lines @@
     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();
+      probing_interval_ms = delay_based_bwe_->GetExpectedBwePeriodMs();
     }
     {
       rtc::CritScope cs(&observer_lock_);
       if (observer_) {
         observer_->OnNetworkChanged(bitrate_bps, fraction_loss, rtt,
                                     probing_interval_ms);
       }
     }
   }
 }
@@ skipping 20 matching lines @@
 bool SendSideCongestionController::IsSendQueueFull() const {
   return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs;
 }
 
 bool SendSideCongestionController::IsNetworkDown() const {
   rtc::CritScope cs(&network_state_lock_);
   return network_state_ == kNetworkDown;
 }
 
 }  // namespace webrtc