6287e82b9b
Reason for revert: Unfortunately, this change breaks internal projects. Specifically the change to the CongestionController interface means anything implementing it will be forced to change in lock-step. Original issue's description: > Pass time constanct to bwe smoothing filter. > > BUG=webrtc:6443, webrtc:6303 > > Committed: https://crrev.com/9abbf5ae4ec7d688a9b4aa03a405f3faadb74b90 > Cr-Commit-Position: refs/heads/master@{#15266} TBR=minyue@webrtc.org,stefan@webrtc.org,solenberg@webrtc.org,michaelt@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6443, webrtc:6303 Review-Url: https://codereview.webrtc.org/2532993002 Cr-Commit-Position: refs/heads/master@{#15272}
51 lines
1.6 KiB
C++
51 lines
1.6 KiB
C++
/*
|
|
* Copyright (c) 2016 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/probing_interval_estimator.h"
|
|
|
|
#include <algorithm>
|
|
#include <utility>
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
constexpr int kMinIntervalMs = 2000;
|
|
constexpr int kMaxIntervalMs = 50000;
|
|
}
|
|
|
|
ProbingIntervalEstimator::ProbingIntervalEstimator(
|
|
const AimdRateControl* aimd_rate_control)
|
|
: ProbingIntervalEstimator(kMinIntervalMs,
|
|
kMaxIntervalMs,
|
|
aimd_rate_control) {}
|
|
|
|
ProbingIntervalEstimator::ProbingIntervalEstimator(
|
|
int min_interval_ms,
|
|
int max_interval_ms,
|
|
const AimdRateControl* aimd_rate_control)
|
|
: min_interval_ms_(min_interval_ms),
|
|
max_interval_ms_(max_interval_ms),
|
|
aimd_rate_control_(aimd_rate_control) {}
|
|
|
|
rtc::Optional<int> ProbingIntervalEstimator::GetIntervalMs() const {
|
|
rtc::Optional<int> bitrate_drop =
|
|
aimd_rate_control_->GetLastBitrateDecreaseBps();
|
|
int increase_rate = aimd_rate_control_->GetNearMaxIncreaseRateBps();
|
|
|
|
if (!bitrate_drop || increase_rate <= 0)
|
|
return rtc::Optional<int>();
|
|
|
|
return rtc::Optional<int>(std::min(
|
|
max_interval_ms_,
|
|
std::max(1000 * (*bitrate_drop) / increase_rate, min_interval_ms_)));
|
|
}
|
|
|
|
} // namespace webrtc
|