Moving overhead counting to bitrate estimators.

webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.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.
  */
 
 #include "webrtc/modules/congestion_controller/probe_bitrate_estimator.h"
 
 #include <vector>
 #include <utility>
 
 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
 
 namespace {
 constexpr int kInvalidBitrate = -1;
 constexpr int kDefaultMinProbes = 5;
 constexpr int kDefaultMinBytes = 5000;
+constexpr size_t kRtpHeadersSize = 12;
+constexpr size_t kTransportHeadersSize = 20;
 }  // anonymous namespace
 
 class TestProbeBitrateEstimator : public ::testing::Test {
  public:
   TestProbeBitrateEstimator() : probe_bitrate_estimator_(nullptr) {}
 
   // TODO(philipel): Use PacedPacketInfo when ProbeBitrateEstimator is rewritten
   //                 to use that information.
   void AddPacketFeedback(int probe_cluster_id,
-                         size_t size_bytes,
+                         size_t payload_size_bytes,
                          int64_t send_time_ms,
                          int64_t arrival_time_ms,
                          int min_probes = kDefaultMinProbes,
                          int min_bytes = kDefaultMinBytes) {
     PacedPacketInfo pacing_info(probe_cluster_id, min_probes, min_bytes);
-    PacketFeedback packet_feedback(arrival_time_ms, send_time_ms, 0, size_bytes,
-                                   pacing_info);
+    PacketFeedback packet_feedback(arrival_time_ms, send_time_ms, 0,
+                                   payload_size_bytes, kRtpHeadersSize,
+                                   kTransportHeadersSize, pacing_info);
     measured_bps_ =
         probe_bitrate_estimator_.HandleProbeAndEstimateBitrate(packet_feedback);
   }
 
  protected:
   int measured_bps_ = kInvalidBitrate;
   ProbeBitrateEstimator probe_bitrate_estimator_;
 };
 
 TEST_F(TestProbeBitrateEstimator, OneCluster) {
@@ skipping 151 matching lines @@
   AddPacketFeedback(0, 1000, 30, 40);
 
   auto estimated_bitrate_bps =
       probe_bitrate_estimator_.FetchAndResetLastEstimatedBitrateBps();
   EXPECT_TRUE(estimated_bitrate_bps);
   EXPECT_NEAR(*estimated_bitrate_bps, 800000, 10);
   EXPECT_FALSE(probe_bitrate_estimator_.FetchAndResetLastEstimatedBitrateBps());
 }
 
 }  // namespace webrtc