Moving overhead counting to bitrate estimators.

webrtc/modules/congestion_controller/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 11 matching lines @@
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
 using ::testing::_;
 using ::testing::Invoke;
 
 namespace webrtc {
 
 namespace {
+
 const PacedPacketInfo kPacingInfo0(0, 5, 2000);
 const PacedPacketInfo kPacingInfo1(1, 8, 4000);
 const PacedPacketInfo kPacingInfo2(2, 14, 7000);
 const PacedPacketInfo kPacingInfo3(3, 20, 10000);
 const PacedPacketInfo kPacingInfo4(4, 22, 10000);
-}
+constexpr size_t kRtpHeadersSize = 12;
+constexpr size_t kTransportHeadersSize = 20;
+
+}  // namespace
 
 namespace test {
 
 class MockPacketFeedbackObserver : public webrtc::PacketFeedbackObserver {
  public:
   MOCK_METHOD2(OnPacketAdded, void(uint32_t ssrc, uint16_t seq_num));
   MOCK_METHOD1(OnPacketFeedbackVector,
                void(const std::vector<PacketFeedback>& packet_feedback_vector));
 };
 
@@ skipping 10 matching lines @@
   virtual void TearDown() { adapter_.reset(); }
 
  protected:
   void OnReceivedEstimatedBitrate(uint32_t bitrate) {}
 
   void OnReceivedRtcpReceiverReport(const ReportBlockList& report_blocks,
                                     int64_t rtt,
                                     int64_t now_ms) {}
 
   void OnSentPacket(const PacketFeedback& packet_feedback) {
-    adapter_->AddPacket(kSsrc, packet_feedback.sequence_number,
-                        packet_feedback.payload_size,
-                        packet_feedback.pacing_info);
+    adapter_->AddPacket(
+        kSsrc, packet_feedback.sequence_number, packet_feedback.payload_size,
+        packet_feedback.rtp_headers_size, packet_feedback.pacing_info);
     adapter_->OnSentPacket(packet_feedback.sequence_number,
                            packet_feedback.send_time_ms);
   }
 
   static constexpr uint32_t kSsrc = 8492;
 
   SimulatedClock clock_;
   std::unique_ptr<TransportFeedbackAdapter> adapter_;
 };
 
 TEST_F(TransportFeedbackAdapterTest, ObserverSanity) {
   MockPacketFeedbackObserver mock;
   adapter_->RegisterPacketFeedbackObserver(&mock);
 
   const std::vector<PacketFeedback> packets = {
-      PacketFeedback(100, 200, 0, 1000, kPacingInfo0),
-      PacketFeedback(110, 210, 1, 2000, kPacingInfo0),
-      PacketFeedback(120, 220, 2, 3000, kPacingInfo0)
-  };
+      PacketFeedback(100, 200, 0, 1000, kRtpHeadersSize, kTransportHeadersSize,
+                     kPacingInfo0),
+      PacketFeedback(110, 210, 1, 2000, kRtpHeadersSize, kTransportHeadersSize,
+                     kPacingInfo0),
+      PacketFeedback(120, 220, 2, 3000, kRtpHeadersSize, kTransportHeadersSize,
+                     kPacingInfo0)};
 
   rtcp::TransportFeedback feedback;
   feedback.SetBase(packets[0].sequence_number,
                    packets[0].arrival_time_ms * 1000);
 
   for (const PacketFeedback& packet : packets) {
     EXPECT_CALL(mock, OnPacketAdded(kSsrc, packet.sequence_number)).Times(1);
     OnSentPacket(packet);
     EXPECT_TRUE(feedback.AddReceivedPacket(packet.sequence_number,
                                            packet.arrival_time_ms * 1000));
   }
 
   EXPECT_CALL(mock, OnPacketFeedbackVector(_)).Times(1);
   adapter_->OnTransportFeedback(feedback);
 
   adapter_->DeRegisterPacketFeedbackObserver(&mock);
 
   // After deregistration, the observer no longers gets indications.
   EXPECT_CALL(mock, OnPacketAdded(_, _)).Times(0);
-  const PacketFeedback new_packet(130, 230, 3, 4000, kPacingInfo0);
+  const PacketFeedback new_packet(130, 230, 3, 4000, kRtpHeadersSize,
+                                  kTransportHeadersSize, kPacingInfo0);
   OnSentPacket(new_packet);
 
   rtcp::TransportFeedback second_feedback;
   second_feedback.SetBase(new_packet.sequence_number,
                           new_packet.arrival_time_ms * 1000);
   EXPECT_TRUE(feedback.AddReceivedPacket(new_packet.sequence_number,
                                          new_packet.arrival_time_ms * 1000));
   EXPECT_CALL(mock, OnPacketFeedbackVector(_)).Times(0);
   adapter_->OnTransportFeedback(second_feedback);
 }
 
 #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 TEST_F(TransportFeedbackAdapterTest, ObserverDoubleRegistrationDeathTest) {
   MockPacketFeedbackObserver mock;
   adapter_->RegisterPacketFeedbackObserver(&mock);
   EXPECT_DEATH(adapter_->RegisterPacketFeedbackObserver(&mock), "");
   adapter_->DeRegisterPacketFeedbackObserver(&mock);
 }
 
 TEST_F(TransportFeedbackAdapterTest, ObserverMissingDeRegistrationDeathTest) {
   MockPacketFeedbackObserver mock;
   adapter_->RegisterPacketFeedbackObserver(&mock);
   EXPECT_DEATH(adapter_.reset(), "");
   adapter_->DeRegisterPacketFeedbackObserver(&mock);
 }
 #endif
 
 TEST_F(TransportFeedbackAdapterTest, AdaptsFeedbackAndPopulatesSendTimes) {
   std::vector<PacketFeedback> packets;
-  packets.push_back(PacketFeedback(100, 200, 0, 1500, kPacingInfo0));
-  packets.push_back(PacketFeedback(110, 210, 1, 1500, kPacingInfo0));
-  packets.push_back(PacketFeedback(120, 220, 2, 1500, kPacingInfo0));
-  packets.push_back(PacketFeedback(130, 230, 3, 1500, kPacingInfo1));
-  packets.push_back(PacketFeedback(140, 240, 4, 1500, kPacingInfo1));
+  packets.push_back(PacketFeedback(100, 200, 0, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo0));
+  packets.push_back(PacketFeedback(110, 210, 1, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo0));
+  packets.push_back(PacketFeedback(120, 220, 2, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo0));
+  packets.push_back(PacketFeedback(130, 230, 3, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo1));
+  packets.push_back(PacketFeedback(140, 240, 4, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo1));
 
   for (const PacketFeedback& packet : packets)
     OnSentPacket(packet);
 
   rtcp::TransportFeedback feedback;
   feedback.SetBase(packets[0].sequence_number,
                    packets[0].arrival_time_ms * 1000);
 
   for (const PacketFeedback& packet : packets) {
     EXPECT_TRUE(feedback.AddReceivedPacket(packet.sequence_number,
                                            packet.arrival_time_ms * 1000));
   }
 
   feedback.Build();
 
   adapter_->OnTransportFeedback(feedback);
   ComparePacketFeedbackVectors(packets, adapter_->GetTransportFeedbackVector());
 }
 
 TEST_F(TransportFeedbackAdapterTest, FeedbackVectorReportsUnreceived) {
   std::vector<PacketFeedback> sent_packets = {
-      PacketFeedback(100, 220, 0, 1500, kPacingInfo0),
-      PacketFeedback(110, 210, 1, 1500, kPacingInfo0),
-      PacketFeedback(120, 220, 2, 1500, kPacingInfo0),
-      PacketFeedback(130, 230, 3, 1500, kPacingInfo0),
-      PacketFeedback(140, 240, 4, 1500, kPacingInfo0),
-      PacketFeedback(150, 250, 5, 1500, kPacingInfo0),
-      PacketFeedback(160, 260, 6, 1500, kPacingInfo0)
-  };
+      PacketFeedback(100, 220, 0, 1500, kRtpHeadersSize, kTransportHeadersSize,
+                     kPacingInfo0),
+      PacketFeedback(110, 210, 1, 1500, kRtpHeadersSize, kTransportHeadersSize,
+                     kPacingInfo0),
+      PacketFeedback(120, 220, 2, 1500, kRtpHeadersSize, kTransportHeadersSize,
+                     kPacingInfo0),
+      PacketFeedback(130, 230, 3, 1500, kRtpHeadersSize, kTransportHeadersSize,
+                     kPacingInfo0),
+      PacketFeedback(140, 240, 4, 1500, kRtpHeadersSize, kTransportHeadersSize,
+                     kPacingInfo0),
+      PacketFeedback(150, 250, 5, 1500, kRtpHeadersSize, kTransportHeadersSize,
+                     kPacingInfo0),
+      PacketFeedback(160, 260, 6, 1500, kRtpHeadersSize, kTransportHeadersSize,
+                     kPacingInfo0)};
 
   for (const PacketFeedback& packet : sent_packets)
     OnSentPacket(packet);
 
   // Note: Important to include the last packet, as only unreceived packets in
   // between received packets can be inferred.
   std::vector<PacketFeedback> received_packets = {
     sent_packets[0], sent_packets[2], sent_packets[6]
   };
 
   rtcp::TransportFeedback feedback;
   feedback.SetBase(received_packets[0].sequence_number,
                    received_packets[0].arrival_time_ms * 1000);
 
   for (const PacketFeedback& packet : received_packets) {
     EXPECT_TRUE(feedback.AddReceivedPacket(packet.sequence_number,
                                            packet.arrival_time_ms * 1000));
   }
 
   feedback.Build();
 
   adapter_->OnTransportFeedback(feedback);
   ComparePacketFeedbackVectors(sent_packets,
                                adapter_->GetTransportFeedbackVector());
 }
 
 TEST_F(TransportFeedbackAdapterTest, HandlesDroppedPackets) {
   std::vector<PacketFeedback> packets;
-  packets.push_back(PacketFeedback(100, 200, 0, 1500, kPacingInfo0));
-  packets.push_back(PacketFeedback(110, 210, 1, 1500, kPacingInfo1));
-  packets.push_back(PacketFeedback(120, 220, 2, 1500, kPacingInfo2));
-  packets.push_back(PacketFeedback(130, 230, 3, 1500, kPacingInfo3));
-  packets.push_back(PacketFeedback(140, 240, 4, 1500, kPacingInfo4));
+  packets.push_back(PacketFeedback(100, 200, 0, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo0));
+  packets.push_back(PacketFeedback(110, 210, 1, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo1));
+  packets.push_back(PacketFeedback(120, 220, 2, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo2));
+  packets.push_back(PacketFeedback(130, 230, 3, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo3));
+  packets.push_back(PacketFeedback(140, 240, 4, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo4));
 
   const uint16_t kSendSideDropBefore = 1;
   const uint16_t kReceiveSideDropAfter = 3;
 
   for (const PacketFeedback& packet : packets) {
     if (packet.sequence_number >= kSendSideDropBefore)
       OnSentPacket(packet);
   }
 
   rtcp::TransportFeedback feedback;
@@ skipping 22 matching lines @@
   adapter_->OnTransportFeedback(feedback);
   ComparePacketFeedbackVectors(expected_packets,
                                adapter_->GetTransportFeedbackVector());
 }
 
 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<PacketFeedback> packets;
-  packets.push_back(
-      PacketFeedback(kHighArrivalTimeMs - 64, 200, 0, 1500, PacedPacketInfo()));
-  packets.push_back(
-      PacketFeedback(kHighArrivalTimeMs + 64, 210, 1, 1500, PacedPacketInfo()));
-  packets.push_back(
-      PacketFeedback(kHighArrivalTimeMs, 220, 2, 1500, PacedPacketInfo()));
+  packets.push_back(PacketFeedback(kHighArrivalTimeMs - 64, 200, 0, 1500,
+                                   kRtpHeadersSize, kTransportHeadersSize,
+                                   PacedPacketInfo()));
+  packets.push_back(PacketFeedback(kHighArrivalTimeMs + 64, 210, 1, 1500,
+                                   kRtpHeadersSize, kTransportHeadersSize,
+                                   PacedPacketInfo()));
+  packets.push_back(PacketFeedback(kHighArrivalTimeMs, 220, 2, 1500,
+                                   kRtpHeadersSize, kTransportHeadersSize,
+                                   PacedPacketInfo()));
 
   for (const PacketFeedback& packet : packets)
     OnSentPacket(packet);
 
   for (size_t i = 0; i < packets.size(); ++i) {
     std::unique_ptr<rtcp::TransportFeedback> feedback(
         new rtcp::TransportFeedback());
     feedback->SetBase(packets[i].sequence_number,
                       packets[i].arrival_time_ms * 1000);
 
     EXPECT_TRUE(feedback->AddReceivedPacket(packets[i].sequence_number,
                                             packets[i].arrival_time_ms * 1000));
 
     rtc::Buffer raw_packet = feedback->Build();
     feedback = rtcp::TransportFeedback::ParseFrom(raw_packet.data(),
                                                   raw_packet.size());
 
     std::vector<PacketFeedback> expected_packets;
     expected_packets.push_back(packets[i]);
 
     adapter_->OnTransportFeedback(*feedback.get());
     ComparePacketFeedbackVectors(expected_packets,
                                  adapter_->GetTransportFeedbackVector());
   }
 }
 
 TEST_F(TransportFeedbackAdapterTest, HandlesArrivalReordering) {
   std::vector<PacketFeedback> packets;
-  packets.push_back(PacketFeedback(120, 200, 0, 1500, kPacingInfo0));
-  packets.push_back(PacketFeedback(110, 210, 1, 1500, kPacingInfo0));
-  packets.push_back(PacketFeedback(100, 220, 2, 1500, kPacingInfo0));
+  packets.push_back(PacketFeedback(120, 200, 0, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo0));
+  packets.push_back(PacketFeedback(110, 210, 1, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo0));
+  packets.push_back(PacketFeedback(100, 220, 2, 1500, kRtpHeadersSize,
+                                   kTransportHeadersSize, kPacingInfo0));
 
   for (const PacketFeedback& packet : packets)
     OnSentPacket(packet);
 
   rtcp::TransportFeedback feedback;
   feedback.SetBase(packets[0].sequence_number,
                    packets[0].arrival_time_ms * 1000);
 
   for (const PacketFeedback& packet : packets) {
     EXPECT_TRUE(feedback.AddReceivedPacket(packet.sequence_number,
@@ skipping 13 matching lines @@
   std::vector<PacketFeedback> sent_packets;
   const int64_t kSmallDeltaUs =
       rtcp::TransportFeedback::kDeltaScaleFactor * ((1 << 8) - 1);
   const int64_t kLargePositiveDeltaUs =
       rtcp::TransportFeedback::kDeltaScaleFactor *
       std::numeric_limits<int16_t>::max();
   const int64_t kLargeNegativeDeltaUs =
       rtcp::TransportFeedback::kDeltaScaleFactor *
       std::numeric_limits<int16_t>::min();
 
-  PacketFeedback packet_feedback(100, 200, 0, 1500, true, 0, 0,
+  PacketFeedback packet_feedback(100, 200, 0, 1500, kRtpHeadersSize,
+                                 kTransportHeadersSize, true, 0, 0,
                                  PacedPacketInfo());
   sent_packets.push_back(packet_feedback);
 
   packet_feedback.send_time_ms += kSmallDeltaUs / 1000;
   packet_feedback.arrival_time_ms += kSmallDeltaUs / 1000;
   ++packet_feedback.sequence_number;
   sent_packets.push_back(packet_feedback);
 
   packet_feedback.send_time_ms += kLargePositiveDeltaUs / 1000;
   packet_feedback.arrival_time_ms += kLargePositiveDeltaUs / 1000;
@@ skipping 53 matching lines @@
   adapter_->OnTransportFeedback(*feedback.get());
   {
     std::vector<PacketFeedback> expected_packets;
     expected_packets.push_back(packet_feedback);
     ComparePacketFeedbackVectors(expected_packets,
                                  adapter_->GetTransportFeedbackVector());
   }
 }
 }  // namespace test
 }  // namespace webrtc