zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cap probing bitrate by the max bitrate instead of hardcoded 10Mbps.

Browse Source 
Previously probing bitrate was capped at 10Mbps, which is too low for some
application. Now ProbeContoller limits max probing rate to max allowed
bitrate, which can be specified by the application.

BUG=webrtc:6332

Review-Url: https://codereview.webrtc.org/2430133005
Cr-Commit-Position: refs/heads/master@{#14927}
This commit is contained in:
sergeyu
2016-11-03 11:59:50 -07:00
committed by Commit bot
parent a4a2a5e84a
commit 07c147d25d
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/modules/congestion_controller/probe_controller.cc
View File

@ -33,8 +33,9 @@ constexpr int64_t kMaxWaitingTimeForProbingResultMs = 1000;
// further probing is disabled.
constexpr int kExponentialProbingDisabled = 0;
// A limit to prevent probing at excessive bitrates.
constexpr int kMaxProbingBitrateBps = 10000000;
// Default probing bitrate limit. Applied only when the application didn't
// specify max bitrate.
constexpr int kDefaultMaxProbingBitrateBps = 100000000;
// This is a limit on how often probing can be done when there is a BW
// drop detected in ALR region.
@ -63,18 +64,21 @@ void ProbeController::SetBitrates(int min_bitrate_bps,
4 * start_bitrate_bps);
}
int old_max_bitrate_bps = max_bitrate_bps_;
max_bitrate_bps_ = max_bitrate_bps;
// Only do probing if:
// we are mid-call, which we consider to be if
// exponential probing is not active and
// |estimated_bitrate_bps_| is valid (> 0) and
// the current bitrate is lower than the new |max_bitrate_bps|, and
// we actually want to increase the |max_bitrate_bps_|.
// |max_bitrate_bps_| was increased.
if (state_ != State::kWaitingForProbingResult &&
estimated_bitrate_bps_ != 0 && estimated_bitrate_bps_ < max_bitrate_bps &&
max_bitrate_bps > max_bitrate_bps_) {
estimated_bitrate_bps_ != 0 &&
estimated_bitrate_bps_ < old_max_bitrate_bps &&
max_bitrate_bps_ > old_max_bitrate_bps) {
InitiateProbing({max_bitrate_bps}, kExponentialProbingDisabled);
}
max_bitrate_bps_ = max_bitrate_bps;
}
void ProbeController::SetEstimatedBitrate(int bitrate_bps) {
@ -131,7 +135,9 @@ void ProbeController::InitiateProbing(
int min_bitrate_to_probe_further_bps) {
bool first_cluster = true;
for (int bitrate : bitrates_to_probe) {
bitrate = std::min(bitrate, kMaxProbingBitrateBps);
int max_probe_bitrate_bps =
max_bitrate_bps_ > 0 ? max_bitrate_bps_ : kDefaultMaxProbingBitrateBps;
bitrate = std::min(bitrate, max_probe_bitrate_bps);
if (first_cluster) {
pacer_->CreateProbeCluster(bitrate, kProbeDeltasPerCluster + 1);
first_cluster = false;

5
webrtc/modules/congestion_controller/probe_controller_unittest.cc
View File

@ -27,7 +27,7 @@ namespace {
constexpr int kMinBitrateBps = 100;
constexpr int kStartBitrateBps = 300;
constexpr int kMaxBitrateBps = 1000;
constexpr int kMaxBitrateBps = 10000;
constexpr int kExponentialProbingTimeoutMs = 5000;
@ -67,6 +67,9 @@ TEST_F(ProbeControllerTest, InitiatesProbingOnMaxBitrateIncrease) {
TEST_F(ProbeControllerTest, TestExponentialProbing) {
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
kMaxBitrateBps);
EXPECT_CALL(pacer_, CreateProbeCluster(2 * 1800, _));
probe_controller_->SetEstimatedBitrate(1800);
}