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 7f3f744ecf70a811610fc7fd05a6d87811b07ffb..a9cf35531375e2f39c2e946c08e8165d8e1d3101 100644 |
--- a/webrtc/modules/congestion_controller/transport_feedback_adapter.cc |
+++ b/webrtc/modules/congestion_controller/transport_feedback_adapter.cc |
@@ -10,6 +10,8 @@ |
#include "webrtc/modules/congestion_controller/transport_feedback_adapter.h" |
+#include <algorithm> |
+ |
#include "webrtc/modules/congestion_controller/delay_based_bwe.h" |
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" |
#include "webrtc/rtc_base/checks.h" |
@@ -128,7 +130,7 @@ std::vector<PacketFeedback> TransportFeedbackAdapter::GetPacketFeedbackVector( |
return packet_feedback_vector; |
} |
packet_feedback_vector.reserve(feedback.GetPacketStatusCount()); |
- |
+ int64_t feedback_rtt = -1; |
{ |
rtc::CritScope cs(&lock_); |
size_t failed_lookups = 0; |
@@ -158,6 +160,10 @@ std::vector<PacketFeedback> TransportFeedbackAdapter::GetPacketFeedbackVector( |
++failed_lookups; |
if (packet_feedback.local_net_id == local_net_id_ && |
packet_feedback.remote_net_id == remote_net_id_) { |
+ if (feedback_rtt == -1 && packet_feedback.send_time_ms >= 0) { |
philipel
2017/08/04 14:13:04
Why don't we calculate the min rtt over all packet
stefan-webrtc
2017/08/07 07:37:11
Do you mean we should remove feedback_rtt == -1 fr
philipel
2017/08/07 11:39:48
Yes, but also calculating the RTT on the first pac
|
+ feedback_rtt = |
+ clock_->TimeInMilliseconds() - packet_feedback.send_time_ms; |
+ } |
packet_feedback_vector.push_back(packet_feedback); |
} |
@@ -169,6 +175,14 @@ std::vector<PacketFeedback> TransportFeedbackAdapter::GetPacketFeedbackVector( |
<< " packet" << (failed_lookups > 1 ? "s" : "") |
<< ". Send time history too small?"; |
} |
+ if (feedback_rtt > -1) { |
+ feedback_rtts_.push_back(feedback_rtt); |
+ const size_t kFeedbackRttWindow = 32; |
+ if (feedback_rtts_.size() > kFeedbackRttWindow) |
+ feedback_rtts_.pop_front(); |
+ min_feedback_rtt_.emplace( |
+ *std::min_element(feedback_rtts_.begin(), feedback_rtts_.end())); |
+ } |
} |
return packet_feedback_vector; |
} |
@@ -188,4 +202,14 @@ std::vector<PacketFeedback> |
TransportFeedbackAdapter::GetTransportFeedbackVector() const { |
return last_packet_feedback_vector_; |
} |
+ |
+rtc::Optional<int64_t> TransportFeedbackAdapter::GetMinFeedbackLoopRtt() const { |
+ rtc::CritScope cs(&lock_); |
+ return min_feedback_rtt_; |
+} |
+ |
+size_t TransportFeedbackAdapter::GetOutstandingBytes() const { |
+ rtc::CritScope cs(&lock_); |
+ return send_time_history_.GetOutstandingBytes(local_net_id_, remote_net_id_); |
+} |
} // namespace webrtc |