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

Change type StreamsConfig::requests_alr_probing to abls::optional

Browse Source 
That means it does not have to be set on every update of StreamsConfig.

BUG=webrtc:9586

Change-Id: I6a348160e209042857c4475323466e2aa92adef8
Reviewed-on: https://webrtc-review.googlesource.com/c/116690
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26184}
This commit is contained in:
Per Kjellander
2019-01-09 17:03:47 +01:00
committed by Commit Bot
parent a80bde3253
commit 79a07cd9f6
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/transport/network_types.h
View File

@ -31,7 +31,7 @@ struct StreamsConfig {
StreamsConfig(const StreamsConfig&); StreamsConfig(const StreamsConfig&);
~StreamsConfig(); ~StreamsConfig();
Timestamp at_time = Timestamp::PlusInfinity(); Timestamp at_time = Timestamp::PlusInfinity();
bool requests_alr_probing = false; absl::optional<bool> requests_alr_probing;
absl::optional<double> pacing_factor; absl::optional<double> pacing_factor;
absl::optional<DataRate> min_pacing_rate; absl::optional<DataRate> min_pacing_rate;
absl::optional<DataRate> max_padding_rate; absl::optional<DataRate> max_padding_rate;

10
modules/congestion_controller/goog_cc/goog_cc_network_control.cc
View File

@ -256,8 +256,10 @@ NetworkControlUpdate GoogCcNetworkController::OnProcessInterval(
initial_config_->constraints.starting_rate); initial_config_->constraints.starting_rate);
update.pacer_config = GetPacingRates(msg.at_time); update.pacer_config = GetPacingRates(msg.at_time);
probe_controller_->EnablePeriodicAlrProbing( if (initial_config_->stream_based_config.requests_alr_probing) {
initial_config_->stream_based_config.requests_alr_probing); probe_controller_->EnablePeriodicAlrProbing(
*initial_config_->stream_based_config.requests_alr_probing);
}
absl::optional<DataRate> total_bitrate = absl::optional<DataRate> total_bitrate =
initial_config_->stream_based_config.max_total_allocated_bitrate; initial_config_->stream_based_config.max_total_allocated_bitrate;
if (total_bitrate) { if (total_bitrate) {
@ -345,7 +347,9 @@ NetworkControlUpdate GoogCcNetworkController::OnSentPacket(
NetworkControlUpdate GoogCcNetworkController::OnStreamsConfig( NetworkControlUpdate GoogCcNetworkController::OnStreamsConfig(
StreamsConfig msg) { StreamsConfig msg) {
NetworkControlUpdate update; NetworkControlUpdate update;
probe_controller_->EnablePeriodicAlrProbing(msg.requests_alr_probing); if (msg.requests_alr_probing) {
probe_controller_->EnablePeriodicAlrProbing(*msg.requests_alr_probing);
}
if (msg.max_total_allocated_bitrate && if (msg.max_total_allocated_bitrate &&
*msg.max_total_allocated_bitrate != max_total_allocated_bitrate_) { *msg.max_total_allocated_bitrate != max_total_allocated_bitrate_) {
update.probe_cluster_configs = update.probe_cluster_configs =