Rename webrtc::PacketInfo to webrtc::PacketFeedback

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 235 matching lines @@
                  << median_slope_threshold_gain_;
   }
   if (!in_trendline_experiment_ && !in_median_slope_experiment_) {
     LOG(LS_INFO) << "No overuse experiment enabled. Using Kalman filter.";
   }
 
   network_thread_.DetachFromThread();
 }
 
 DelayBasedBwe::Result DelayBasedBwe::IncomingPacketFeedbackVector(
-    const std::vector<PacketInfo>& packet_feedback_vector) {
+    const std::vector<PacketFeedback>& 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;
   bool delayed_feedback = true;
-  for (const auto& packet_info : packet_feedback_vector) {
-    if (packet_info.send_time_ms < 0)
+  for (const auto& packet_feedback : packet_feedback_vector) {
+    if (packet_feedback.send_time_ms < 0)
       continue;
     delayed_feedback = false;
-    Result result = IncomingPacketInfo(packet_info);
+    Result result = IncomingPacketFeedback(packet_feedback);
     if (result.updated)
       aggregated_result = result;
   }
   if (delayed_feedback) {
     ++consecutive_delayed_feedbacks_;
   } else {
     consecutive_delayed_feedbacks_ = 0;
   }
   if (consecutive_delayed_feedbacks_ >= kMaxConsecutiveFailedLookups) {
     aggregated_result =
@@ skipping 13 matching lines @@
                             arrival_time_ms);
   Result result;
   result.updated = true;
   result.probe = false;
   result.target_bitrate_bps = rate_control_.LatestEstimate();
   LOG(LS_WARNING) << "Long feedback delay detected, reducing BWE to "
                   << result.target_bitrate_bps;
   return result;
 }
 
-DelayBasedBwe::Result DelayBasedBwe::IncomingPacketInfo(
-    const PacketInfo& info) {
+DelayBasedBwe::Result DelayBasedBwe::IncomingPacketFeedback(
+    const PacketFeedback& packet_feedback) {
   int64_t now_ms = clock_->TimeInMilliseconds();
 
-  receiver_incoming_bitrate_.Update(info.arrival_time_ms, info.payload_size);
+  receiver_incoming_bitrate_.Update(packet_feedback.arrival_time_ms,
+                                    packet_feedback.payload_size);
   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));
     kalman_estimator_.reset(new OveruseEstimator(OverUseDetectorOptions()));
     trendline_estimator_.reset(new TrendlineEstimator(
         trendline_window_size_, trendline_smoothing_coeff_,
         trendline_threshold_gain_));
     median_slope_estimator_.reset(new MedianSlopeEstimator(
         median_slope_window_size_, median_slope_threshold_gain_));
   }
   last_seen_packet_ms_ = now_ms;
 
   uint32_t send_time_24bits =
       static_cast<uint32_t>(
-          ((static_cast<uint64_t>(info.send_time_ms) << kAbsSendTimeFraction) +
+          ((static_cast<uint64_t>(packet_feedback.send_time_ms)
+            << kAbsSendTimeFraction) +
            500) /
           1000) &
       0x00FFFFFF;
   // Shift up send time to use the full 32 bits that inter_arrival works with,
   // so wrapping works properly.
   uint32_t timestamp = send_time_24bits << kAbsSendTimeInterArrivalUpshift;
 
   uint32_t ts_delta = 0;
   int64_t t_delta = 0;
   int size_delta = 0;
-  if (inter_arrival_->ComputeDeltas(timestamp, info.arrival_time_ms, now_ms,
-                                    info.payload_size, &ts_delta, &t_delta,
-                                    &size_delta)) {
+  if (inter_arrival_->ComputeDeltas(timestamp, packet_feedback.arrival_time_ms,
+                                    now_ms, packet_feedback.payload_size,
+                                    &ts_delta, &t_delta, &size_delta)) {
     double ts_delta_ms = (1000.0 * ts_delta) / (1 << kInterArrivalShift);
     if (in_trendline_experiment_) {
-      trendline_estimator_->Update(t_delta, ts_delta_ms, info.arrival_time_ms);
+      trendline_estimator_->Update(t_delta, ts_delta_ms,
+                                   packet_feedback.arrival_time_ms);
       detector_.Detect(trendline_estimator_->trendline_slope(), ts_delta_ms,
                        trendline_estimator_->num_of_deltas(),
-                       info.arrival_time_ms);
+                       packet_feedback.arrival_time_ms);
     } else if (in_median_slope_experiment_) {
       median_slope_estimator_->Update(t_delta, ts_delta_ms,
-                                      info.arrival_time_ms);
+                                      packet_feedback.arrival_time_ms);
       detector_.Detect(median_slope_estimator_->trendline_slope(), ts_delta_ms,
                        median_slope_estimator_->num_of_deltas(),
-                       info.arrival_time_ms);
+                       packet_feedback.arrival_time_ms);
     } else {
       kalman_estimator_->Update(t_delta, ts_delta_ms, size_delta,
-                                detector_.State(), info.arrival_time_ms);
+                                detector_.State(),
+                                packet_feedback.arrival_time_ms);
       detector_.Detect(kalman_estimator_->offset(), ts_delta_ms,
                        kalman_estimator_->num_of_deltas(),
-                       info.arrival_time_ms);
+                       packet_feedback.arrival_time_ms);
     }
   }
 
   int probing_bps = 0;
-  if (info.pacing_info.probe_cluster_id != PacedPacketInfo::kNotAProbe) {
-    probing_bps = probe_bitrate_estimator_.HandleProbeAndEstimateBitrate(info);
+  if (packet_feedback.pacing_info.probe_cluster_id !=
+      PacedPacketInfo::kNotAProbe) {
+    probing_bps =
+        probe_bitrate_estimator_.HandleProbeAndEstimateBitrate(packet_feedback);
   }
   rtc::Optional<uint32_t> acked_bitrate_bps =
       receiver_incoming_bitrate_.bitrate_bps();
   // Currently overusing the bandwidth.
   if (detector_.State() == kBwOverusing) {
     if (acked_bitrate_bps &&
         rate_control_.TimeToReduceFurther(now_ms, *acked_bitrate_bps)) {
       result.updated =
-          UpdateEstimate(info.arrival_time_ms, now_ms, acked_bitrate_bps,
-                         &result.target_bitrate_bps);
+          UpdateEstimate(packet_feedback.arrival_time_ms, now_ms,
+                         acked_bitrate_bps, &result.target_bitrate_bps);
     }
   } else if (probing_bps > 0) {
     // No overuse, but probing measured a bitrate.
-    rate_control_.SetEstimate(probing_bps, info.arrival_time_ms);
+    rate_control_.SetEstimate(probing_bps, packet_feedback.arrival_time_ms);
     result.probe = true;
     result.updated =
-        UpdateEstimate(info.arrival_time_ms, now_ms, acked_bitrate_bps,
-                       &result.target_bitrate_bps);
+        UpdateEstimate(packet_feedback.arrival_time_ms, now_ms,
+                       acked_bitrate_bps, &result.target_bitrate_bps);
   }
   if (!result.updated &&
       (last_update_ms_ == -1 ||
        now_ms - last_update_ms_ > rate_control_.GetFeedbackInterval())) {
     result.updated =
-        UpdateEstimate(info.arrival_time_ms, now_ms, acked_bitrate_bps,
-                       &result.target_bitrate_bps);
+        UpdateEstimate(packet_feedback.arrival_time_ms, now_ms,
+                       acked_bitrate_bps, &result.target_bitrate_bps);
   }
   if (result.updated) {
     last_update_ms_ = now_ms;
     BWE_TEST_LOGGING_PLOT(1, "target_bitrate_bps", now_ms,
                           result.target_bitrate_bps);
     if (event_log_ && (result.target_bitrate_bps != last_logged_bitrate_ ||
                        detector_.State() != last_logged_state_)) {
       event_log_->LogDelayBasedBweUpdate(result.target_bitrate_bps,
                                          detector_.State());
       last_logged_bitrate_ = result.target_bitrate_bps;
@@ skipping 44 matching lines @@
 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.
   rate_control_.SetMinBitrate(min_bitrate_bps);
 }
 
 int64_t DelayBasedBwe::GetProbingIntervalMs() const {
   return probing_interval_estimator_.GetIntervalMs();
 }
 }  // namespace webrtc