Moving overhead counting to bitrate estimators.

webrtc/modules/congestion_controller/transport_feedback_adapter.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.
  */
 
 #include "webrtc/modules/congestion_controller/transport_feedback_adapter.h"
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/mod_ops.h"
 #include "webrtc/modules/congestion_controller/delay_based_bwe.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
 
 namespace webrtc {
 
 const int64_t kNoTimestamp = -1;
 const int64_t kSendTimeHistoryWindowMs = 60000;
 const int64_t kBaseTimestampScaleFactor =
     rtcp::TransportFeedback::kDeltaScaleFactor * (1 << 8);
 const int64_t kBaseTimestampRangeSizeUs = kBaseTimestampScaleFactor * (1 << 24);
 
 TransportFeedbackAdapter::TransportFeedbackAdapter(const Clock* clock)
-    : send_side_bwe_with_overhead_(
-          webrtc::field_trial::IsEnabled("WebRTC-SendSideBwe-WithOverhead")),
-      transport_overhead_bytes_per_packet_(0),
+    : transport_overhead_bytes_per_packet_(0),
       send_time_history_(clock, kSendTimeHistoryWindowMs),
       clock_(clock),
       current_offset_ms_(kNoTimestamp),
       last_timestamp_us_(kNoTimestamp),
       local_net_id_(0),
       remote_net_id_(0) {}
 
 TransportFeedbackAdapter::~TransportFeedbackAdapter() {
   RTC_DCHECK(observers_.empty());
 }
@@ skipping 11 matching lines @@
     PacketFeedbackObserver* observer) {
   rtc::CritScope cs(&observers_lock_);
   RTC_DCHECK(observer);
   const auto it = std::find(observers_.begin(), observers_.end(), observer);
   RTC_DCHECK(it != observers_.end());
   observers_.erase(it);
 }
 
 void TransportFeedbackAdapter::AddPacket(uint32_t ssrc,
                                          uint16_t sequence_number,
-                                         size_t length,
+                                         size_t payload_size,
+                                         size_t rtp_headers_size,
                                          const PacedPacketInfo& pacing_info) {
   {
     rtc::CritScope cs(&lock_);
-    if (send_side_bwe_with_overhead_) {
-      length += transport_overhead_bytes_per_packet_;
-    }
     const int64_t creation_time_ms = clock_->TimeInMilliseconds();
     send_time_history_.AddAndRemoveOld(
-        PacketFeedback(creation_time_ms, sequence_number, length, local_net_id_,
-                       remote_net_id_, pacing_info));
+        PacketFeedback(creation_time_ms, sequence_number, payload_size,
+                       rtp_headers_size, transport_overhead_bytes_per_packet_,
+                       local_net_id_, remote_net_id_, pacing_info));
   }
 
   {
     rtc::CritScope cs(&observers_lock_);
     for (auto observer : observers_) {
       observer->OnPacketAdded(ssrc, sequence_number);
     }
   }
 }
 
@@ skipping 98 matching lines @@
       observer->OnPacketFeedbackVector(last_packet_feedback_vector_);
     }
   }
 }
 
 std::vector<PacketFeedback>
 TransportFeedbackAdapter::GetTransportFeedbackVector() const {
   return last_packet_feedback_vector_;
 }
 }  // namespace webrtc