Rename variables to reflect that DelayBasedBwe lives on the send side rather than receive side.

webrtc/modules/congestion_controller/delay_based_bwe.cc

 /*
  *  Copyright (c) 2016 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 26 matching lines @@
 constexpr uint32_t kFixedSsrc = 0;
 }  // namespace
 
 namespace webrtc {
 
 DelayBasedBwe::DelayBasedBwe(Clock* clock)
     : clock_(clock),
       inter_arrival_(),
       estimator_(),
       detector_(OverUseDetectorOptions()),
-      incoming_bitrate_(kBitrateWindowMs, 8000),
+      receiver_incoming_bitrate_(kBitrateWindowMs, 8000),
       last_update_ms_(-1),
       last_seen_packet_ms_(-1),
       uma_recorded_(false) {
   network_thread_.DetachFromThread();
 }
 
 DelayBasedBwe::Result DelayBasedBwe::IncomingPacketFeedbackVector(
     const std::vector<PacketInfo>& packet_feedback_vector) {
   RTC_DCHECK(network_thread_.CalledOnValidThread());
   if (!uma_recorded_) {
     RTC_HISTOGRAM_ENUMERATION(kBweTypeHistogram,
                               BweNames::kSendSideTransportSeqNum,
                               BweNames::kBweNamesMax);
     uma_recorded_ = true;
   }
   Result aggregated_result;
   for (const auto& packet_info : packet_feedback_vector) {
     Result result = IncomingPacketInfo(packet_info);
     if (result.updated)
       aggregated_result = result;
   }
   return aggregated_result;
 }
 
 DelayBasedBwe::Result DelayBasedBwe::IncomingPacketInfo(
     const PacketInfo& info) {
   int64_t now_ms = clock_->TimeInMilliseconds();
 
-  incoming_bitrate_.Update(info.payload_size, info.arrival_time_ms);
+  receiver_incoming_bitrate_.Update(info.payload_size, info.arrival_time_ms);
   Result result;
   // Reset if the stream has timed out.
   if (last_seen_packet_ms_ == -1 ||
       now_ms - last_seen_packet_ms_ > kStreamTimeOutMs) {
     inter_arrival_.reset(
         new InterArrival((kTimestampGroupLengthMs << kInterArrivalShift) / 1000,
                          kTimestampToMs, true));
     estimator_.reset(new OveruseEstimator(OverUseDetectorOptions()));
   }
   last_seen_packet_ms_ = now_ms;
@@ skipping 22 matching lines @@
   }
 
   int probing_bps = 0;
   if (info.probe_cluster_id != PacketInfo::kNotAProbe) {
     probing_bps = probe_bitrate_estimator_.HandleProbeAndEstimateBitrate(info);
   }
 
   // Currently overusing the bandwidth.
   if (detector_.State() == kBwOverusing) {
     rtc::Optional<uint32_t> incoming_rate =
-        incoming_bitrate_.Rate(info.arrival_time_ms);
+        receiver_incoming_bitrate_.Rate(info.arrival_time_ms);
     if (incoming_rate &&
-        remote_rate_.TimeToReduceFurther(now_ms, *incoming_rate)) {
+        rate_control_.TimeToReduceFurther(now_ms, *incoming_rate)) {
       result.updated = UpdateEstimate(info.arrival_time_ms, now_ms,
                                       &result.target_bitrate_bps);
     }
   } else if (probing_bps > 0) {
     // No overuse, but probing measured a bitrate.
-    remote_rate_.SetEstimate(probing_bps, info.arrival_time_ms);
+    rate_control_.SetEstimate(probing_bps, info.arrival_time_ms);
     result.probe = true;
     result.updated = UpdateEstimate(info.arrival_time_ms, now_ms,
                                     &result.target_bitrate_bps);
   }
   rtc::Optional<uint32_t> incoming_rate =
-      incoming_bitrate_.Rate(info.arrival_time_ms);
+      receiver_incoming_bitrate_.Rate(info.arrival_time_ms);

[stefan-webrtc, 2016/10/15 05:21:37]

This seems to be unused. Feel free to remove.

[terelius, 2016/10/18 12:39:57]

Will do in a follow-up CL.

   if (!result.updated &&
       (last_update_ms_ == -1 ||
-       now_ms - last_update_ms_ > remote_rate_.GetFeedbackInterval())) {
+       now_ms - last_update_ms_ > rate_control_.GetFeedbackInterval())) {
     result.updated = UpdateEstimate(info.arrival_time_ms, now_ms,
                                     &result.target_bitrate_bps);
   }
   if (result.updated)
     last_update_ms_ = now_ms;
 
   return result;
 }
 
 bool DelayBasedBwe::UpdateEstimate(int64_t arrival_time_ms,
                                    int64_t now_ms,
                                    uint32_t* target_bitrate_bps) {
   // The first overuse should immediately trigger a new estimate.
   // We also have to update the estimate immediately if we are overusing
   // and the target bitrate is too high compared to what we are receiving.
   const RateControlInput input(detector_.State(),
-                               incoming_bitrate_.Rate(arrival_time_ms),
+                               receiver_incoming_bitrate_.Rate(arrival_time_ms),
                                estimator_->var_noise());
-  remote_rate_.Update(&input, now_ms);
-  *target_bitrate_bps = remote_rate_.UpdateBandwidthEstimate(now_ms);
-  return remote_rate_.ValidEstimate();
+  rate_control_.Update(&input, now_ms);
+  *target_bitrate_bps = rate_control_.UpdateBandwidthEstimate(now_ms);
+  return rate_control_.ValidEstimate();
 }
 
 void DelayBasedBwe::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) {
-  remote_rate_.SetRtt(avg_rtt_ms);
+  rate_control_.SetRtt(avg_rtt_ms);
 }
 
 bool DelayBasedBwe::LatestEstimate(std::vector<uint32_t>* ssrcs,
                                    uint32_t* bitrate_bps) const {
   // Currently accessed from both the process thread (see
   // ModuleRtpRtcpImpl::Process()) and the configuration thread (see
   // Call::GetStats()). Should in the future only be accessed from a single
   // thread.
   RTC_DCHECK(ssrcs);
   RTC_DCHECK(bitrate_bps);
-  if (!remote_rate_.ValidEstimate())
+  if (!rate_control_.ValidEstimate())
     return false;
 
   *ssrcs = {kFixedSsrc};
-  *bitrate_bps = remote_rate_.LatestEstimate();
+  *bitrate_bps = rate_control_.LatestEstimate();
   return true;
 }
 
 void DelayBasedBwe::SetMinBitrate(int min_bitrate_bps) {
   // Called from both the configuration thread and the network thread. Shouldn't
   // be called from the network thread in the future.
-  remote_rate_.SetMinBitrate(min_bitrate_bps);
+  rate_control_.SetMinBitrate(min_bitrate_bps);
 }
 }  // namespace webrtc