Reimplemeted "Test and fix for huge bwe drop after alr state"

webrtc/modules/congestion_controller/send_side_congestion_controller.cc

 /*
  *  Copyright (c) 2012 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/include/send_side_congestion_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/ptr_util.h"
 #include "webrtc/base/rate_limiter.h"
 #include "webrtc/base/socket.h"
 #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/remote_bitrate_estimator/include/bwe_defines.h"
 
 namespace webrtc {
 namespace {
 
 static const int64_t kRetransmitWindowSizeMs = 500;
 
 // Makes sure that the bitrate and the min, max values are in valid range.
 static void ClampBitrates(int* bitrate_bps,
@@ skipping 237 matching lines @@
 }
 
 void SendSideCongestionController::OnTransportFeedback(
     const rtcp::TransportFeedback& feedback) {
   RTC_DCHECK_RUNS_SERIALIZED(&worker_race_);
   transport_feedback_adapter_.OnTransportFeedback(feedback);
   std::vector<PacketFeedback> feedback_vector = ReceivedPacketFeedbackVector(
       transport_feedback_adapter_.GetTransportFeedbackVector());
   SortPacketFeedbackVector(&feedback_vector);
   acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector(
-      feedback_vector);
+      feedback_vector,
+      static_cast<bool>(pacer_->GetApplicationLimitedRegionStartTime()));

[stefan-webrtc, 2017/07/06 15:28:37]

I prefer:
pacer_->GetApplicationLimitedRegionStartTime() > 0 and no cast.

[tschumi, 2017/07/07 07:51:14]

GetApplicationLimitedRegionStartTime returns a rtc::Optional<int64_t>
And the information i like to gain is if the optional is set.
So "GetApplicationLimitedRegionStartTime() > 0" will not work.

[holmer, 2017/07/07 07:53:06]

Ah, my bad :)

Maybe you don't even need the cast then?

[terelius, 2017/07/07 08:01:19]

I think the cast is needed, but there is a .has_value() that you can use
instead.

[tschumi, 2017/07/07 09:07:59]

Ok use has_value() now.

   DelayBasedBwe::Result result;
   {
     rtc::CritScope cs(&bwe_lock_);
     result = delay_based_bwe_->IncomingPacketFeedbackVector(
         feedback_vector, acknowledged_bitrate_estimator_->bitrate_bps());
   }
   if (result.updated)
     bitrate_controller_->OnDelayBasedBweResult(result);
 }
 
@@ skipping 55 matching lines @@
 bool SendSideCongestionController::IsSendQueueFull() const {
   return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs;
 }
 
 bool SendSideCongestionController::IsNetworkDown() const {
   rtc::CritScope cs(&network_state_lock_);
   return network_state_ == kNetworkDown;
 }
 
 }  // namespace webrtc