Moving overhead counting to bitrate estimators.

webrtc/modules/congestion_controller/probe_bitrate_estimator.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 <algorithm>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
+#include "webrtc/system_wrappers/include/field_trial.h"
 
 namespace {
 // The minumum number of probes we need to receive feedback about in percent
 // in order to have a valid estimate.
 constexpr int kMinReceivedProbesPercent = 80;
 
 // The minumum number of bytes we need to receive feedback about in percent
 // in order to have a valid estimate.
 constexpr int kMinReceivedBytesPercent = 80;
 
 // The maximum (receive rate)/(send rate) ratio for a valid estimate.
 constexpr float kValidRatio = 2.0f;
 
 // The maximum time period over which the cluster history is retained.
 // This is also the maximum time period beyond which a probing burst is not
 // expected to last.
 constexpr int kMaxClusterHistoryMs = 1000;
 
 // The maximum time interval between first and the last probe on a cluster
 // on the sender side as well as the receive side.
 constexpr int kMaxProbeIntervalMs = 1000;
 }  // namespace
 
 namespace webrtc {
 
 ProbeBitrateEstimator::ProbeBitrateEstimator(RtcEventLog* event_log)
-    : event_log_(event_log) {}
+    : event_log_(event_log),
+      send_side_bwe_with_overhead_(
+          webrtc::field_trial::IsEnabled("WebRTC-SendSideBwe-WithOverhead")) {}
 
 int ProbeBitrateEstimator::HandleProbeAndEstimateBitrate(
     const PacketFeedback& packet_feedback) {
   int cluster_id = packet_feedback.pacing_info.probe_cluster_id;
   RTC_DCHECK_NE(cluster_id, PacedPacketInfo::kNotAProbe);
 
   EraseOldClusters(packet_feedback.arrival_time_ms - kMaxClusterHistoryMs);
 
-  int payload_size_bits = packet_feedback.payload_size * 8;
+  const size_t packet_size = send_side_bwe_with_overhead_
+                                 ? packet_feedback.payload_size +
+                                       packet_feedback.rtp_headers_size +
+                                       packet_feedback.transport_headers_size
+                                 : packet_feedback.payload_size;
+  int packet_size_bits = packet_size * 8;
+
   AggregatedCluster* cluster = &clusters_[cluster_id];
 
   if (packet_feedback.send_time_ms < cluster->first_send_ms) {
     cluster->first_send_ms = packet_feedback.send_time_ms;
   }
   if (packet_feedback.send_time_ms > cluster->last_send_ms) {
     cluster->last_send_ms = packet_feedback.send_time_ms;
-    cluster->size_last_send = payload_size_bits;
+    cluster->size_last_send = packet_size_bits;
   }
   if (packet_feedback.arrival_time_ms < cluster->first_receive_ms) {
     cluster->first_receive_ms = packet_feedback.arrival_time_ms;
-    cluster->size_first_receive = payload_size_bits;
+    cluster->size_first_receive = packet_size_bits;
   }
   if (packet_feedback.arrival_time_ms > cluster->last_receive_ms) {
     cluster->last_receive_ms = packet_feedback.arrival_time_ms;
   }
-  cluster->size_total += payload_size_bits;
+  cluster->size_total += packet_size_bits;
   cluster->num_probes += 1;
 
   RTC_DCHECK_GT(packet_feedback.pacing_info.probe_cluster_min_probes, 0);
   RTC_DCHECK_GT(packet_feedback.pacing_info.probe_cluster_min_bytes, 0);
 
   int min_probes = packet_feedback.pacing_info.probe_cluster_min_probes *
                    kMinReceivedProbesPercent / 100;
   int min_bytes = packet_feedback.pacing_info.probe_cluster_min_bytes *
                   kMinReceivedBytesPercent / 100;
   if (cluster->num_probes < min_probes || cluster->size_total < min_bytes * 8)
@@ skipping 70 matching lines @@
 void ProbeBitrateEstimator::EraseOldClusters(int64_t timestamp_ms) {
   for (auto it = clusters_.begin(); it != clusters_.end();) {
     if (it->second.last_receive_ms < timestamp_ms) {
       it = clusters_.erase(it);
     } else {
       ++it;
     }
   }
 }
 }  // namespace webrtc