Control rtt_mult addition cap via experiment.

Bug: webrtc:10717
Change-Id: I68f7d8216e1a1611e692dd82ba96890cad98c7de
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140284
Commit-Queue: Michael Horowitz <mhoro@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28191}
This commit is contained in:
“Michael
2019-06-07 03:55:01 -05:00
committed by Commit Bot
parent 944dacec25
commit d3a4ebe332
6 changed files with 64 additions and 27 deletions

View File

@ -62,7 +62,8 @@ FrameBuffer::FrameBuffer(Clock* clock,
stats_callback_(stats_callback),
last_log_non_decoded_ms_(-kLogNonDecodedIntervalMs),
add_rtt_to_playout_delay_(
webrtc::field_trial::IsEnabled("WebRTC-AddRttToPlayoutDelay")) {}
webrtc::field_trial::IsEnabled("WebRTC-AddRttToPlayoutDelay")),
rtt_mult_settings_(RttMultExperiment::GetRttMultValue()) {}
FrameBuffer::~FrameBuffer() {}
@ -299,11 +300,10 @@ EncodedFrame* FrameBuffer::GetNextFrame() {
}
float rtt_mult = protection_mode_ == kProtectionNackFEC ? 0.0 : 1.0;
absl::optional<double> rtt_mult_add_cap_ms = absl::nullopt;
if (RttMultExperiment::RttMultEnabled()) {
rtt_mult = RttMultExperiment::GetRttMultValue();
// TODO(mhoro): add RttMultExperiment::GetJitterEstCapValue();
rtt_mult_add_cap_ms = 200.0;
absl::optional<float> rtt_mult_add_cap_ms = absl::nullopt;
if (rtt_mult_settings_.has_value()) {
rtt_mult = rtt_mult_settings_->rtt_mult_setting;
rtt_mult_add_cap_ms = rtt_mult_settings_->rtt_mult_add_cap_ms;
}
timing_->SetJitterDelay(
jitter_estimator_.GetJitterEstimate(rtt_mult, rtt_mult_add_cap_ms));