Index: webrtc/modules/congestion_controller/send_side_congestion_controller.cc |
diff --git a/webrtc/modules/congestion_controller/send_side_congestion_controller.cc b/webrtc/modules/congestion_controller/send_side_congestion_controller.cc |
index 60e692ccdfe46c4ea3e04b110a31448af0da7ea0..299f47223c8937cfd715e44a938ef4d4b4cfe8a2 100644 |
--- a/webrtc/modules/congestion_controller/send_side_congestion_controller.cc |
+++ b/webrtc/modules/congestion_controller/send_side_congestion_controller.cc |
@@ -15,16 +15,19 @@ |
#include <vector> |
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" |
-#include "webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h" |
+#include "webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.h" |
#include "webrtc/modules/congestion_controller/probe_controller.h" |
+#include "webrtc/modules/pacing/alr_detector.h" |
#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" |
#include "webrtc/rtc_base/checks.h" |
#include "webrtc/rtc_base/logging.h" |
#include "webrtc/rtc_base/ptr_util.h" |
#include "webrtc/rtc_base/rate_limiter.h" |
#include "webrtc/rtc_base/socket.h" |
+#include "webrtc/rtc_base/timeutils.h" |
namespace webrtc { |
+ |
namespace { |
static const int64_t kRetransmitWindowSizeMs = 500; |
@@ -277,6 +280,14 @@ void SendSideCongestionController::OnTransportFeedback( |
std::vector<PacketFeedback> feedback_vector = ReceivedPacketFeedbackVector( |
transport_feedback_adapter_.GetTransportFeedbackVector()); |
SortPacketFeedbackVector(&feedback_vector); |
+ |
+ rtc::Optional<int64_t> alr_start_time_ms = |
terelius
2017/07/14 15:44:52
If we are never going to use the value, could we c
tschumi
2017/07/17 06:41:04
Done.
|
+ pacer_->GetApplicationLimitedRegionStartTime(); |
+ if (!alr_start_time_ms && last_alr_start_time_ms_) { |
+ acknowledged_bitrate_estimator_->SetAlrEndedTimeMs(rtc::TimeMillis()); |
+ } |
+ last_alr_start_time_ms_ = alr_start_time_ms; |
+ |
acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector( |
feedback_vector); |
DelayBasedBwe::Result result; |