Index: webrtc/modules/congestion_controller/transport_feedback_adapter.cc |
diff --git a/webrtc/modules/congestion_controller/transport_feedback_adapter.cc b/webrtc/modules/congestion_controller/transport_feedback_adapter.cc |
index 88caad41d667eff09844478788b653a325a940cf..dc8cdee1f1f851ccad199bce6dfe3922eb3eb463 100644 |
--- a/webrtc/modules/congestion_controller/transport_feedback_adapter.cc |
+++ b/webrtc/modules/congestion_controller/transport_feedback_adapter.cc |
@@ -15,7 +15,6 @@ |
#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 { |
@@ -26,9 +25,7 @@ const int64_t kBaseTimestampScaleFactor = |
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), |
@@ -60,17 +57,16 @@ void TransportFeedbackAdapter::DeRegisterPacketFeedbackObserver( |
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)); |
} |
{ |