Rename webrtc::PacketInfo to webrtc::PacketFeedback

webrtc/modules/congestion_controller/transport_feedback_adapter.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 12 matching lines @@
 #include "webrtc/system_wrappers/include/field_trial.h"
 
 namespace webrtc {
 
 const int64_t kNoTimestamp = -1;
 const int64_t kSendTimeHistoryWindowMs = 60000;
 const int64_t kBaseTimestampScaleFactor =
     rtcp::TransportFeedback::kDeltaScaleFactor * (1 << 8);
 const int64_t kBaseTimestampRangeSizeUs = kBaseTimestampScaleFactor * (1 << 24);
 
-class PacketInfoComparator {
+class PacketFeedbackComparator {
  public:
-  inline bool operator()(const PacketInfo& lhs, const PacketInfo& rhs) {
+  inline bool operator()(const PacketFeedback& lhs, const PacketFeedback& rhs) {
     if (lhs.arrival_time_ms != rhs.arrival_time_ms)
       return lhs.arrival_time_ms < rhs.arrival_time_ms;
     if (lhs.send_time_ms != rhs.send_time_ms)
       return lhs.send_time_ms < rhs.send_time_ms;
     return lhs.sequence_number < rhs.sequence_number;
   }
 };
 
 TransportFeedbackAdapter::TransportFeedbackAdapter(
     RtcEventLog* event_log,
@@ skipping 57 matching lines @@
     int transport_overhead_bytes_per_packet) {
   rtc::CritScope cs(&lock_);
   transport_overhead_bytes_per_packet_ = transport_overhead_bytes_per_packet;
 }
 
 int64_t TransportFeedbackAdapter::GetProbingIntervalMs() const {
   rtc::CritScope cs(&bwe_lock_);
   return delay_based_bwe_->GetProbingIntervalMs();
 }
 
-std::vector<PacketInfo> TransportFeedbackAdapter::GetPacketFeedbackVector(
+std::vector<PacketFeedback> TransportFeedbackAdapter::GetPacketFeedbackVector(
     const rtcp::TransportFeedback& feedback) {
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   int64_t timestamp_us = feedback.GetBaseTimeUs();
   // Add timestamp deltas to a local time base selected on first packet arrival.
   // This won't be the true time base, but makes it easier to manually inspect
   // time stamps.
   if (last_timestamp_us_ == kNoTimestamp) {
     current_offset_ms_ = clock_->TimeInMilliseconds();
   } else {
     int64_t delta = timestamp_us - last_timestamp_us_;
 
     // Detect and compensate for wrap-arounds in base time.
     if (std::abs(delta - kBaseTimestampRangeSizeUs) < std::abs(delta)) {
       delta -= kBaseTimestampRangeSizeUs;  // Wrap backwards.
     } else if (std::abs(delta + kBaseTimestampRangeSizeUs) < std::abs(delta)) {
       delta += kBaseTimestampRangeSizeUs;  // Wrap forwards.
     }
 
     current_offset_ms_ += delta / 1000;
   }
   last_timestamp_us_ = timestamp_us;
 
   auto received_packets = feedback.GetReceivedPackets();
-  std::vector<PacketInfo> packet_feedback_vector;
+  std::vector<PacketFeedback> packet_feedback_vector;
   packet_feedback_vector.reserve(received_packets.size());
   if (received_packets.empty()) {
     LOG(LS_INFO) << "Empty transport feedback packet received.";
     return packet_feedback_vector;
   }
   {
     rtc::CritScope cs(&lock_);
     size_t failed_lookups = 0;
     int64_t offset_us = 0;
     int64_t timestamp_ms = 0;
     for (const auto& packet : feedback.GetReceivedPackets()) {
       offset_us += packet.delta_us();
       timestamp_ms = current_offset_ms_ + (offset_us / 1000);
-      PacketInfo info(timestamp_ms, packet.sequence_number());
-      if (!send_time_history_.GetInfo(&info, true))
+      PacketFeedback packet_feedback(timestamp_ms, packet.sequence_number());
+      if (!send_time_history_.GetFeedback(&packet_feedback, true))
         ++failed_lookups;
-      packet_feedback_vector.push_back(info);
+      packet_feedback_vector.push_back(packet_feedback);
     }
     std::sort(packet_feedback_vector.begin(), packet_feedback_vector.end(),
-              PacketInfoComparator());
+              PacketFeedbackComparator());
     if (failed_lookups > 0) {
       LOG(LS_WARNING) << "Failed to lookup send time for " << failed_lookups
                       << " packet" << (failed_lookups > 1 ? "s" : "")
                       << ". Send time history too small?";
     }
   }
   return packet_feedback_vector;
 }
 
 void TransportFeedbackAdapter::OnTransportFeedback(
     const rtcp::TransportFeedback& feedback) {
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   last_packet_feedback_vector_ = GetPacketFeedbackVector(feedback);
   DelayBasedBwe::Result result;
   {
     rtc::CritScope cs(&bwe_lock_);
     result = delay_based_bwe_->IncomingPacketFeedbackVector(
         last_packet_feedback_vector_);
   }
   if (result.updated)
     bitrate_controller_->OnDelayBasedBweResult(result);
 }
 
-std::vector<PacketInfo> TransportFeedbackAdapter::GetTransportFeedbackVector()
-    const {
+std::vector<PacketFeedback>
+TransportFeedbackAdapter::GetTransportFeedbackVector() const {
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   return last_packet_feedback_vector_;
 }
 
 void TransportFeedbackAdapter::OnRttUpdate(int64_t avg_rtt_ms,
                                            int64_t max_rtt_ms) {
   RTC_DCHECK(module_process_thread_checker_.CalledOnValidThread());
   rtc::CritScope cs(&bwe_lock_);
   delay_based_bwe_->OnRttUpdate(avg_rtt_ms, max_rtt_ms);
 }
 
 }  // namespace webrtc