Rename webrtc::PacketInfo to webrtc::PacketFeedback

webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.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 37 matching lines @@
 
 int SendSideBweSender::GetFeedbackIntervalMs() const {
   return kFeedbackIntervalMs;
 }
 
 void SendSideBweSender::GiveFeedback(const FeedbackPacket& feedback) {
   const SendSideBweFeedback& fb =
       static_cast<const SendSideBweFeedback&>(feedback);
   if (fb.packet_feedback_vector().empty())
     return;
-  std::vector<PacketInfo> packet_feedback_vector(fb.packet_feedback_vector());
-  for (PacketInfo& packet_info : packet_feedback_vector) {
-    if (!send_time_history_.GetInfo(&packet_info, true)) {
+  std::vector<PacketFeedback> packet_feedback_vector(
+      fb.packet_feedback_vector());
+  for (PacketFeedback& packet_feedback : packet_feedback_vector) {
+    if (!send_time_history_.GetFeedback(&packet_feedback, true)) {
       int64_t now_ms = clock_->TimeInMilliseconds();
       if (now_ms - last_log_time_ms_ > 5000) {
         LOG(LS_WARNING) << "Ack arrived too late.";
         last_log_time_ms_ = now_ms;
       }
     }
   }
 
   int64_t rtt_ms =
       clock_->TimeInMilliseconds() - feedback.latest_send_time_ms();
@@ skipping 65 matching lines @@
 SendSideBweReceiver::SendSideBweReceiver(int flow_id)
     : BweReceiver(flow_id), last_feedback_ms_(0) {
 }
 
 SendSideBweReceiver::~SendSideBweReceiver() {
 }
 
 void SendSideBweReceiver::ReceivePacket(int64_t arrival_time_ms,
                                         const MediaPacket& media_packet) {
   packet_feedback_vector_.push_back(
-      PacketInfo(-1, arrival_time_ms, media_packet.sender_timestamp_ms(),
-                 media_packet.header().sequenceNumber,
-                 media_packet.payload_size(), PacedPacketInfo()));
+      PacketFeedback(-1, arrival_time_ms, media_packet.sender_timestamp_ms(),
+                     media_packet.header().sequenceNumber,
+                     media_packet.payload_size(), PacedPacketInfo()));
 
   // Log received packet information.
   BweReceiver::ReceivePacket(arrival_time_ms, media_packet);
 }
 
 FeedbackPacket* SendSideBweReceiver::GetFeedback(int64_t now_ms) {
   if (now_ms - last_feedback_ms_ < kFeedbackIntervalMs)
     return NULL;
   last_feedback_ms_ = now_ms;
   int64_t corrected_send_time_ms =
       packet_feedback_vector_.back().send_time_ms + now_ms -
       packet_feedback_vector_.back().arrival_time_ms;
   FeedbackPacket* fb = new SendSideBweFeedback(
       flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_);
   packet_feedback_vector_.clear();
   return fb;
 }
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc