From bf94fda1e4b3bff094906d8c581c62d221fc0a5e Mon Sep 17 00:00:00 2001 From: minyue-webrtc Date: Fri, 1 Sep 2017 10:44:37 +0200 Subject: [PATCH] Renaming probing_interval to bwe_period globally. This is a follow up of https://codereview.webrtc.org/2888893002/. Bug: None Change-Id: Ia76903858c0a6f2801f14878980e18ae6d3b85e6 Reviewed-on: https://chromium-review.googlesource.com/646020 Reviewed-by: Karl Wiberg Commit-Queue: Minyue Li (BackIn2018March) Cr-Commit-Position: refs/heads/master@{#19644} --- .../audio_coding/codecs/cng/audio_encoder_cng.cc | 4 ++-- .../audio_coding/codecs/cng/audio_encoder_cng.h | 2 +- .../audio_coding/codecs/opus/audio_encoder_opus.cc | 14 +++++++------- .../audio_coding/codecs/opus/audio_encoder_opus.h | 2 +- .../codecs/red/audio_encoder_copy_red.cc | 4 ++-- .../codecs/red/audio_encoder_copy_red.h | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc index 993fffea5a..52661d32fa 100644 --- a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc +++ b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc @@ -198,9 +198,9 @@ void AudioEncoderCng::OnReceivedUplinkRecoverablePacketLossFraction( void AudioEncoderCng::OnReceivedUplinkBandwidth( int target_audio_bitrate_bps, - rtc::Optional probing_interval_ms) { + rtc::Optional bwe_period_ms) { speech_encoder_->OnReceivedUplinkBandwidth(target_audio_bitrate_bps, - probing_interval_ms); + bwe_period_ms); } AudioEncoder::EncodedInfo AudioEncoderCng::EncodePassive( diff --git a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h index 563e997ebb..66305e6ab9 100644 --- a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h +++ b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h @@ -69,7 +69,7 @@ class AudioEncoderCng final : public AudioEncoder { float uplink_recoverable_packet_loss_fraction) override; void OnReceivedUplinkBandwidth( int target_audio_bitrate_bps, - rtc::Optional probing_interval_ms) override; + rtc::Optional bwe_period_ms) override; private: EncodedInfo EncodePassive(size_t frames_to_encode, diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc index 5756e2af68..cd47bf4265 100644 --- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc +++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc @@ -514,22 +514,22 @@ void AudioEncoderOpus::OnReceivedUplinkRecoverablePacketLossFraction( void AudioEncoderOpus::OnReceivedUplinkBandwidth( int target_audio_bitrate_bps, - rtc::Optional probing_interval_ms) { + rtc::Optional bwe_period_ms) { if (audio_network_adaptor_) { audio_network_adaptor_->SetTargetAudioBitrate(target_audio_bitrate_bps); // We give smoothed bitrate allocation to audio network adaptor as // the uplink bandwidth. - // The probing spikes should not affect the bitrate smoother more than 25%. + // The BWE spikes should not affect the bitrate smoother more than 25%. // To simplify the calculations we use a step response as input signal. // The step response of an exponential filter is // u(t) = 1 - e^(-t / time_constant). // In order to limit the affect of a BWE spike within 25% of its value // before - // the next probing, we would choose a time constant that fulfills - // 1 - e^(-probing_interval_ms / time_constant) < 0.25 - // Then 4 * probing_interval_ms is a good choice. - if (probing_interval_ms) - bitrate_smoother_->SetTimeConstantMs(*probing_interval_ms * 4); + // the next BWE update, we would choose a time constant that fulfills + // 1 - e^(-bwe_period_ms / time_constant) < 0.25 + // Then 4 * bwe_period_ms is a good choice. + if (bwe_period_ms) + bitrate_smoother_->SetTimeConstantMs(*bwe_period_ms * 4); bitrate_smoother_->AddSample(target_audio_bitrate_bps); ApplyAudioNetworkAdaptor(); diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h index 2382700fab..f78cf1e39c 100644 --- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h +++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h @@ -111,7 +111,7 @@ class AudioEncoderOpus final : public AudioEncoder { float uplink_recoverable_packet_loss_fraction) override; void OnReceivedUplinkBandwidth( int target_audio_bitrate_bps, - rtc::Optional probing_interval_ms) override; + rtc::Optional bwe_period_ms) override; void OnReceivedRtt(int rtt_ms) override; void OnReceivedOverhead(size_t overhead_bytes_per_packet) override; void SetReceiverFrameLengthRange(int min_frame_length_ms, diff --git a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc index 0ce7d345ec..3680ff0c99 100644 --- a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc +++ b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc @@ -134,9 +134,9 @@ void AudioEncoderCopyRed::OnReceivedUplinkRecoverablePacketLossFraction( void AudioEncoderCopyRed::OnReceivedUplinkBandwidth( int target_audio_bitrate_bps, - rtc::Optional probing_interval_ms) { + rtc::Optional bwe_period_ms) { speech_encoder_->OnReceivedUplinkBandwidth(target_audio_bitrate_bps, - probing_interval_ms); + bwe_period_ms); } } // namespace webrtc diff --git a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h index 4261c472d1..664c13e429 100644 --- a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h +++ b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h @@ -57,7 +57,7 @@ class AudioEncoderCopyRed final : public AudioEncoder { float uplink_recoverable_packet_loss_fraction) override; void OnReceivedUplinkBandwidth( int target_audio_bitrate_bps, - rtc::Optional probing_interval_ms) override; + rtc::Optional bwe_period_ms) override; protected: EncodedInfo EncodeImpl(uint32_t rtp_timestamp,