From 79a07cd9f60f8c49e202cd86e881f5d05a5f8081 Mon Sep 17 00:00:00 2001 From: Per Kjellander Date: Wed, 9 Jan 2019 17:03:47 +0100 Subject: [PATCH] Change type StreamsConfig::requests_alr_probing to abls::optional 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 Commit-Queue: Per Kjellander Cr-Commit-Position: refs/heads/master@{#26184} --- api/transport/network_types.h | 2 +- .../goog_cc/goog_cc_network_control.cc | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/api/transport/network_types.h b/api/transport/network_types.h index e3880b9729..ad484ea800 100644 --- a/api/transport/network_types.h +++ b/api/transport/network_types.h @@ -31,7 +31,7 @@ struct StreamsConfig { StreamsConfig(const StreamsConfig&); ~StreamsConfig(); Timestamp at_time = Timestamp::PlusInfinity(); - bool requests_alr_probing = false; + absl::optional requests_alr_probing; absl::optional pacing_factor; absl::optional min_pacing_rate; absl::optional max_padding_rate; diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc index f0eef4b9af..b996e34ade 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -256,8 +256,10 @@ NetworkControlUpdate GoogCcNetworkController::OnProcessInterval( initial_config_->constraints.starting_rate); update.pacer_config = GetPacingRates(msg.at_time); - probe_controller_->EnablePeriodicAlrProbing( - initial_config_->stream_based_config.requests_alr_probing); + if (initial_config_->stream_based_config.requests_alr_probing) { + probe_controller_->EnablePeriodicAlrProbing( + *initial_config_->stream_based_config.requests_alr_probing); + } absl::optional total_bitrate = initial_config_->stream_based_config.max_total_allocated_bitrate; if (total_bitrate) { @@ -345,7 +347,9 @@ NetworkControlUpdate GoogCcNetworkController::OnSentPacket( NetworkControlUpdate GoogCcNetworkController::OnStreamsConfig( StreamsConfig msg) { 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 && *msg.max_total_allocated_bitrate != max_total_allocated_bitrate_) { update.probe_cluster_configs =