Wire up transport sequence number / send time callbacks to webrtc via libjingle.

webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.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 85 matching lines @@
       EXPECT_EQ(truth[i].arrival_time_ms,
                 input[i].arrival_time_ms + arrival_time_delta);
       EXPECT_EQ(truth[i].send_time_ms, input[i].send_time_ms);
       EXPECT_EQ(truth[i].sequence_number, input[i].sequence_number);
       EXPECT_EQ(truth[i].payload_size, input[i].payload_size);
       EXPECT_EQ(truth[i].was_paced, input[i].was_paced);
     }
   }
 
   // Utility method, to reset arrival_time_ms before adding send time.
-  void OnPacketSent(PacketInfo info) {
+  void OnSentPacket(PacketInfo info) {
     info.arrival_time_ms = 0;
-    adapter_->OnPacketSent(info);
+    adapter_->OnSentPacket(info);
   }
 
   SimulatedClock clock_;
   MockProcessThread process_thread_;
   MockRemoteBitrateEstimator* bitrate_estimator_;
   rtc::scoped_ptr<TransportFeedbackAdapter> adapter_;
 
   uint32_t receiver_estimated_bitrate_;
 };
 
 TEST_F(TransportFeedbackAdapterTest, AdaptsFeedbackAndPopulatesSendTimes) {
   std::vector<PacketInfo> packets;
   packets.push_back(PacketInfo(100, 200, 0, 1500, true));
   packets.push_back(PacketInfo(110, 210, 1, 1500, true));
   packets.push_back(PacketInfo(120, 220, 2, 1500, true));
   packets.push_back(PacketInfo(130, 230, 3, 1500, true));
   packets.push_back(PacketInfo(140, 240, 4, 1500, true));
 
   for (const PacketInfo& packet : packets)
-    OnPacketSent(packet);
+    OnSentPacket(packet);
 
   rtcp::TransportFeedback feedback;
   feedback.WithBase(packets[0].sequence_number,
                     packets[0].arrival_time_ms * 1000);
 
   for (const PacketInfo& packet : packets) {
     EXPECT_TRUE(feedback.WithReceivedPacket(packet.sequence_number,
                                             packet.arrival_time_ms * 1000));
   }
 
@@ skipping 14 matching lines @@
   packets.push_back(PacketInfo(110, 210, 1, 1500, true));
   packets.push_back(PacketInfo(120, 220, 2, 1500, true));
   packets.push_back(PacketInfo(130, 230, 3, 1500, true));
   packets.push_back(PacketInfo(140, 240, 4, 1500, true));
 
   const uint16_t kSendSideDropBefore = 1;
   const uint16_t kReceiveSideDropAfter = 3;
 
   for (const PacketInfo& packet : packets) {
     if (packet.sequence_number >= kSendSideDropBefore)
-      OnPacketSent(packet);
+      OnSentPacket(packet);
   }
 
   rtcp::TransportFeedback feedback;
   feedback.WithBase(packets[0].sequence_number,
                     packets[0].arrival_time_ms * 1000);
 
   for (const PacketInfo& packet : packets) {
     if (packet.sequence_number <= kReceiveSideDropAfter) {
       EXPECT_TRUE(feedback.WithReceivedPacket(packet.sequence_number,
                                               packet.arrival_time_ms * 1000));
@@ skipping 18 matching lines @@
 TEST_F(TransportFeedbackAdapterTest, SendTimeWrapsBothWays) {
   int64_t kHighArrivalTimeMs = rtcp::TransportFeedback::kDeltaScaleFactor *
                                static_cast<int64_t>(1 << 8) *
                                static_cast<int64_t>((1 << 23) - 1) / 1000;
   std::vector<PacketInfo> packets;
   packets.push_back(PacketInfo(kHighArrivalTimeMs - 64, 200, 0, 1500, true));
   packets.push_back(PacketInfo(kHighArrivalTimeMs + 64, 210, 1, 1500, true));
   packets.push_back(PacketInfo(kHighArrivalTimeMs, 220, 2, 1500, true));
 
   for (const PacketInfo& packet : packets)
-    OnPacketSent(packet);
+    OnSentPacket(packet);
 
   for (size_t i = 0; i < packets.size(); ++i) {
     rtc::scoped_ptr<rtcp::TransportFeedback> feedback(
         new rtcp::TransportFeedback());
     feedback->WithBase(packets[i].sequence_number,
                        packets[i].arrival_time_ms * 1000);
 
     EXPECT_TRUE(feedback->WithReceivedPacket(
         packets[i].sequence_number, packets[i].arrival_time_ms * 1000));
 
@@ skipping 43 matching lines @@
   ++info.sequence_number;
   sent_packets.push_back(info);
 
   // Too large, delta - will need two feedback messages.
   info.send_time_ms += (kLargePositiveDeltaUs + 1000) / 1000;
   info.arrival_time_ms += (kLargePositiveDeltaUs + 1000) / 1000;
   ++info.sequence_number;
 
   // Packets will be added to send history.
   for (const PacketInfo& packet : sent_packets)
-    OnPacketSent(packet);
-  OnPacketSent(info);
+    OnSentPacket(packet);
+  OnSentPacket(info);
 
   // Create expected feedback and send into adapter.
   rtc::scoped_ptr<rtcp::TransportFeedback> feedback(
       new rtcp::TransportFeedback());
   feedback->WithBase(sent_packets[0].sequence_number,
                      sent_packets[0].arrival_time_ms * 1000);
 
   for (const PacketInfo& packet : sent_packets) {
     EXPECT_TRUE(feedback->WithReceivedPacket(packet.sequence_number,
                                              packet.arrival_time_ms * 1000));
@@ skipping 36 matching lines @@
           }));
   adapter_->OnTransportFeedback(*feedback.get());
 
   sent_packets.push_back(info);
 
   ComparePacketVectors(sent_packets, received_feedback);
 }
 
 }  // namespace test
 }  // namespace webrtc