Replace rtc::Optional with absl::optional
This is a no-op change because rtc::Optional is an alias to absl::optional
This CL generated by running script from modules with parameters
'pacing video_coding congestion_controller remote_bitrate_estimator':
find $@ -type f \( -name \*.h -o -name \*.cc \) \
-exec sed -i 's|rtc::Optional|absl::optional|g' {} \+ \
-exec sed -i 's|rtc::nullopt|absl::nullopt|g' {} \+ \
-exec sed -i 's|#include "api/optional.h"|#include "absl/types/optional.h"|' {} \+
find $@ -type f -name BUILD.gn \
-exec sed -r -i 's|"(../)*api:optional"|"//third_party/abseil-cpp/absl/types:optional"|' {} \+;
git cl format
Bug: webrtc:9078
Change-Id: I8ea501d7f1ee36e8d8cd3ed37e6b763c7fe29118
Reviewed-on: https://webrtc-review.googlesource.com/83900
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23640}diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn
index 789770a..fad65ef 100644
--- a/modules/congestion_controller/goog_cc/BUILD.gn
+++ b/modules/congestion_controller/goog_cc/BUILD.gn
@@ -43,7 +43,6 @@
"../..:module_api",
"../../..:webrtc_common",
"../../../:typedefs",
- "../../../api:optional",
"../../../api/transport:network_control",
"../../../logging:rtc_event_log_api",
"../../../logging:rtc_event_pacing",
@@ -57,6 +56,7 @@
"../../pacing",
"../../remote_bitrate_estimator",
"../../rtp_rtcp:rtp_rtcp_format",
+ "//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -85,7 +85,6 @@
}
deps = [
- "../../../api:optional",
"../../../logging:rtc_event_bwe",
"../../../logging:rtc_event_log_api",
"../../../rtc_base:checks",
@@ -96,6 +95,7 @@
"../../../system_wrappers:metrics_api",
"../../remote_bitrate_estimator",
"../../rtp_rtcp:rtp_rtcp_format",
+ "//third_party/abseil-cpp/absl/types:optional",
]
}
diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc
index 49d1b3a..c5d4289 100644
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc
+++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc
@@ -47,7 +47,7 @@
}
}
-rtc::Optional<uint32_t> AcknowledgedBitrateEstimator::bitrate_bps() const {
+absl::optional<uint32_t> AcknowledgedBitrateEstimator::bitrate_bps() const {
return bitrate_estimator_->bitrate_bps();
}
diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h
index c545a4a..faa6b48 100644
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h
+++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h
@@ -14,7 +14,7 @@
#include <memory>
#include <vector>
-#include "api/optional.h"
+#include "absl/types/optional.h"
#include "modules/congestion_controller/goog_cc/bitrate_estimator.h"
namespace webrtc {
@@ -31,12 +31,12 @@
void IncomingPacketFeedbackVector(
const std::vector<PacketFeedback>& packet_feedback_vector);
- rtc::Optional<uint32_t> bitrate_bps() const;
+ absl::optional<uint32_t> bitrate_bps() const;
void SetAlrEndedTimeMs(int64_t alr_ended_time_ms);
private:
void MaybeExpectFastRateChange(int64_t packet_arrival_time_ms);
- rtc::Optional<int64_t> alr_ended_time_ms_;
+ absl::optional<int64_t> alr_ended_time_ms_;
std::unique_ptr<BitrateEstimator> bitrate_estimator_;
};
diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
index 38f8df7..92a24c6 100644
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
+++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
@@ -35,7 +35,7 @@
class MockBitrateEstimator : public BitrateEstimator {
public:
MOCK_METHOD2(Update, void(int64_t now_ms, int bytes));
- MOCK_CONST_METHOD0(bitrate_bps, rtc::Optional<uint32_t>());
+ MOCK_CONST_METHOD0(bitrate_bps, absl::optional<uint32_t>());
MOCK_METHOD0(ExpectFastRateChange, void());
};
@@ -124,7 +124,7 @@
TEST(TestAcknowledgedBitrateEstimator, ReturnBitrate) {
auto states = CreateTestStates();
- rtc::Optional<uint32_t> return_value(42);
+ absl::optional<uint32_t> return_value(42);
EXPECT_CALL(*states.mock_bitrate_estimator, bitrate_bps())
.Times(1)
.WillOnce(Return(return_value));
diff --git a/modules/congestion_controller/goog_cc/alr_detector.cc b/modules/congestion_controller/goog_cc/alr_detector.cc
index f36b1f9..941809d 100644
--- a/modules/congestion_controller/goog_cc/alr_detector.cc
+++ b/modules/congestion_controller/goog_cc/alr_detector.cc
@@ -35,7 +35,7 @@
alr_budget_(0, true),
event_log_(event_log) {
RTC_CHECK(AlrExperimentSettings::MaxOneFieldTrialEnabled());
- rtc::Optional<AlrExperimentSettings> experiment_settings =
+ absl::optional<AlrExperimentSettings> experiment_settings =
AlrExperimentSettings::CreateFromFieldTrial(
AlrExperimentSettings::kScreenshareProbingBweExperimentName);
if (!experiment_settings) {
@@ -89,7 +89,7 @@
alr_budget_.set_target_rate_kbps(rtc::dchecked_cast<int>(target_rate_kbps));
}
-rtc::Optional<int64_t> AlrDetector::GetApplicationLimitedRegionStartTime()
+absl::optional<int64_t> AlrDetector::GetApplicationLimitedRegionStartTime()
const {
return alr_started_time_ms_;
}
diff --git a/modules/congestion_controller/goog_cc/alr_detector.h b/modules/congestion_controller/goog_cc/alr_detector.h
index 98293a7..36fb952 100644
--- a/modules/congestion_controller/goog_cc/alr_detector.h
+++ b/modules/congestion_controller/goog_cc/alr_detector.h
@@ -11,7 +11,7 @@
#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_
-#include "api/optional.h"
+#include "absl/types/optional.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/pacing/interval_budget.h"
#include "modules/pacing/paced_sender.h"
@@ -44,7 +44,7 @@
// Returns time in milliseconds when the current application-limited region
// started or empty result if the sender is currently not application-limited.
- rtc::Optional<int64_t> GetApplicationLimitedRegionStartTime() const;
+ absl::optional<int64_t> GetApplicationLimitedRegionStartTime() const;
// Sent traffic percentage as a function of network capacity used to determine
// application-limited region. ALR region start when bandwidth usage drops
@@ -63,10 +63,10 @@
int alr_start_budget_level_percent_;
int alr_stop_budget_level_percent_;
- rtc::Optional<int64_t> last_send_time_ms_;
+ absl::optional<int64_t> last_send_time_ms_;
IntervalBudget alr_budget_;
- rtc::Optional<int64_t> alr_started_time_ms_;
+ absl::optional<int64_t> alr_started_time_ms_;
RtcEventLog* event_log_;
};
diff --git a/modules/congestion_controller/goog_cc/alr_detector_unittest.cc b/modules/congestion_controller/goog_cc/alr_detector_unittest.cc
index 9aeab51..0aaa2e1 100644
--- a/modules/congestion_controller/goog_cc/alr_detector_unittest.cc
+++ b/modules/congestion_controller/goog_cc/alr_detector_unittest.cc
@@ -65,8 +65,8 @@
}
AlrDetector* const alr_detector_;
int64_t* timestamp_ms_;
- rtc::Optional<int> interval_ms_;
- rtc::Optional<int> usage_percentage_;
+ absl::optional<int> interval_ms_;
+ absl::optional<int> usage_percentage_;
};
} // namespace
@@ -152,7 +152,7 @@
TEST_F(AlrDetectorTest, ParseControlFieldTrial) {
webrtc::test::ScopedFieldTrials field_trial(
"WebRTC-ProbingScreenshareBwe/Control/");
- rtc::Optional<AlrExperimentSettings> parsed_params =
+ absl::optional<AlrExperimentSettings> parsed_params =
AlrExperimentSettings::CreateFromFieldTrial(
"WebRTC-ProbingScreenshareBwe");
EXPECT_FALSE(static_cast<bool>(parsed_params));
@@ -161,7 +161,7 @@
TEST_F(AlrDetectorTest, ParseActiveFieldTrial) {
webrtc::test::ScopedFieldTrials field_trial(
"WebRTC-ProbingScreenshareBwe/1.1,2875,85,20,-20,1/");
- rtc::Optional<AlrExperimentSettings> parsed_params =
+ absl::optional<AlrExperimentSettings> parsed_params =
AlrExperimentSettings::CreateFromFieldTrial(
"WebRTC-ProbingScreenshareBwe");
ASSERT_TRUE(static_cast<bool>(parsed_params));
diff --git a/modules/congestion_controller/goog_cc/bitrate_estimator.cc b/modules/congestion_controller/goog_cc/bitrate_estimator.cc
index 5280b38..692c3da 100644
--- a/modules/congestion_controller/goog_cc/bitrate_estimator.cc
+++ b/modules/congestion_controller/goog_cc/bitrate_estimator.cc
@@ -92,9 +92,9 @@
return bitrate_sample;
}
-rtc::Optional<uint32_t> BitrateEstimator::bitrate_bps() const {
+absl::optional<uint32_t> BitrateEstimator::bitrate_bps() const {
if (bitrate_estimate_ < 0.f)
- return rtc::nullopt;
+ return absl::nullopt;
return bitrate_estimate_ * 1000;
}
diff --git a/modules/congestion_controller/goog_cc/bitrate_estimator.h b/modules/congestion_controller/goog_cc/bitrate_estimator.h
index f49ace4..24f08fa 100644
--- a/modules/congestion_controller/goog_cc/bitrate_estimator.h
+++ b/modules/congestion_controller/goog_cc/bitrate_estimator.h
@@ -13,7 +13,7 @@
#include <vector>
-#include "api/optional.h"
+#include "absl/types/optional.h"
namespace webrtc {
@@ -28,7 +28,7 @@
virtual ~BitrateEstimator();
virtual void Update(int64_t now_ms, int bytes);
- virtual rtc::Optional<uint32_t> bitrate_bps() const;
+ virtual absl::optional<uint32_t> bitrate_bps() const;
virtual void ExpectFastRateChange();
diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.cc b/modules/congestion_controller/goog_cc/delay_based_bwe.cc
index fea5a66..818af94 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe.cc
+++ b/modules/congestion_controller/goog_cc/delay_based_bwe.cc
@@ -114,7 +114,7 @@
DelayBasedBwe::Result DelayBasedBwe::IncomingPacketFeedbackVector(
const std::vector<PacketFeedback>& packet_feedback_vector,
- rtc::Optional<uint32_t> acked_bitrate_bps,
+ absl::optional<uint32_t> acked_bitrate_bps,
int64_t at_time_ms) {
RTC_DCHECK(std::is_sorted(packet_feedback_vector.begin(),
packet_feedback_vector.end(),
@@ -225,13 +225,13 @@
}
DelayBasedBwe::Result DelayBasedBwe::MaybeUpdateEstimate(
- rtc::Optional<uint32_t> acked_bitrate_bps,
+ absl::optional<uint32_t> acked_bitrate_bps,
bool recovered_from_overuse,
int64_t at_time_ms) {
Result result;
int64_t now_ms = at_time_ms;
- rtc::Optional<int> probe_bitrate_bps =
+ absl::optional<int> probe_bitrate_bps =
probe_bitrate_estimator_.FetchAndResetLastEstimatedBitrateBps();
// Currently overusing the bandwidth.
if (delay_detector_->State() == BandwidthUsage::kBwOverusing) {
@@ -284,7 +284,7 @@
}
bool DelayBasedBwe::UpdateEstimate(int64_t now_ms,
- rtc::Optional<uint32_t> acked_bitrate_bps,
+ absl::optional<uint32_t> acked_bitrate_bps,
uint32_t* target_bitrate_bps) {
// TODO(terelius): RateControlInput::noise_var is deprecated and will be
// removed. In the meantime, we set it to zero.
diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.h b/modules/congestion_controller/goog_cc/delay_based_bwe.h
index 485f687..08f59c8 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe.h
+++ b/modules/congestion_controller/goog_cc/delay_based_bwe.h
@@ -48,7 +48,7 @@
Result IncomingPacketFeedbackVector(
const std::vector<PacketFeedback>& packet_feedback_vector,
- rtc::Optional<uint32_t> acked_bitrate_bps,
+ absl::optional<uint32_t> acked_bitrate_bps,
int64_t at_time_ms);
void OnRttUpdate(int64_t avg_rtt_ms);
bool LatestEstimate(std::vector<uint32_t>* ssrcs,
@@ -61,13 +61,13 @@
void IncomingPacketFeedback(const PacketFeedback& packet_feedback,
int64_t at_time_ms);
Result OnLongFeedbackDelay(int64_t arrival_time_ms);
- Result MaybeUpdateEstimate(rtc::Optional<uint32_t> acked_bitrate_bps,
+ Result MaybeUpdateEstimate(absl::optional<uint32_t> acked_bitrate_bps,
bool request_probe,
int64_t at_time_ms);
// Updates the current remote rate estimate and returns true if a valid
// estimate exists.
bool UpdateEstimate(int64_t now_ms,
- rtc::Optional<uint32_t> acked_bitrate_bps,
+ absl::optional<uint32_t> acked_bitrate_bps,
uint32_t* target_bitrate_bps);
rtc::RaceChecker network_race_;
diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc
index b19e8f9..a4afcaf 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc
+++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc
@@ -31,7 +31,7 @@
TEST_F(DelayBasedBweTest, NoCrashEmptyFeedback) {
std::vector<PacketFeedback> packet_feedback_vector;
bitrate_estimator_->IncomingPacketFeedbackVector(
- packet_feedback_vector, rtc::nullopt, kDummyTimestamp);
+ packet_feedback_vector, absl::nullopt, kDummyTimestamp);
}
TEST_F(DelayBasedBweTest, NoCrashOnlyLostFeedback) {
@@ -43,7 +43,7 @@
PacketFeedback::kNoSendTime,
1, 1500, PacedPacketInfo()));
bitrate_estimator_->IncomingPacketFeedbackVector(
- packet_feedback_vector, rtc::nullopt, kDummyTimestamp);
+ packet_feedback_vector, absl::nullopt, kDummyTimestamp);
}
TEST_F(DelayBasedBweTest, ProbeDetection) {
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 829faea..8c00ad8 100644
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
+++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
@@ -101,7 +101,7 @@
return packet_feedback_vector;
}
-int64_t GetBpsOrDefault(const rtc::Optional<DataRate>& rate,
+int64_t GetBpsOrDefault(const absl::optional<DataRate>& rate,
int64_t fallback_bps) {
if (rate && rate->IsFinite()) {
return rate->bps();
@@ -175,7 +175,7 @@
NetworkControlUpdate GoogCcNetworkController::OnProcessInterval(
ProcessInterval msg) {
bandwidth_estimation_->UpdateEstimate(msg.at_time.ms());
- rtc::Optional<int64_t> start_time_ms =
+ absl::optional<int64_t> start_time_ms =
alr_detector_->GetApplicationLimitedRegionStartTime();
probe_controller_->SetAlrStartTimeMs(start_time_ms);
probe_controller_->Process(msg.at_time.ms());
@@ -244,13 +244,13 @@
NetworkControlUpdate GoogCcNetworkController::OnTargetRateConstraints(
TargetRateConstraints constraints) {
- UpdateBitrateConstraints(constraints, rtc::nullopt);
+ UpdateBitrateConstraints(constraints, absl::nullopt);
return MaybeTriggerOnNetworkChanged(constraints.at_time);
}
void GoogCcNetworkController::UpdateBitrateConstraints(
TargetRateConstraints constraints,
- rtc::Optional<DataRate> starting_rate) {
+ absl::optional<DataRate> starting_rate) {
int64_t min_bitrate_bps = GetBpsOrDefault(constraints.min_data_rate, 0);
int64_t max_bitrate_bps = GetBpsOrDefault(constraints.max_data_rate, -1);
int64_t start_bitrate_bps = GetBpsOrDefault(starting_rate, -1);
@@ -301,7 +301,7 @@
std::vector<PacketFeedback> received_feedback_vector =
ReceivedPacketsFeedbackAsRtp(report);
- rtc::Optional<int64_t> alr_start_time =
+ absl::optional<int64_t> alr_start_time =
alr_detector_->GetApplicationLimitedRegionStartTime();
if (previously_in_alr && !alr_start_time.has_value()) {
@@ -336,13 +336,14 @@
return update;
}
-rtc::Optional<DataSize> GoogCcNetworkController::MaybeUpdateCongestionWindow() {
+absl::optional<DataSize>
+GoogCcNetworkController::MaybeUpdateCongestionWindow() {
if (!in_cwnd_experiment_)
- return rtc::nullopt;
+ return absl::nullopt;
// No valid RTT. Could be because send-side BWE isn't used, in which case
// we don't try to limit the outstanding packets.
if (!min_feedback_rtt_ms_)
- return rtc::nullopt;
+ return absl::nullopt;
const DataSize kMinCwnd = DataSize::bytes(2 * 1500);
TimeDelta time_window =
diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.h b/modules/congestion_controller/goog_cc/goog_cc_network_control.h
index 3afd8d2..ba66fce 100644
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control.h
+++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.h
@@ -16,7 +16,7 @@
#include <memory>
#include <vector>
-#include "api/optional.h"
+#include "absl/types/optional.h"
#include "api/transport/network_control.h"
#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/bitrate_controller/send_side_bandwidth_estimation.h"
@@ -51,8 +51,8 @@
private:
void UpdateBitrateConstraints(TargetRateConstraints constraints,
- rtc::Optional<DataRate> starting_rate);
- rtc::Optional<DataSize> MaybeUpdateCongestionWindow();
+ absl::optional<DataRate> starting_rate);
+ absl::optional<DataSize> MaybeUpdateCongestionWindow();
NetworkControlUpdate MaybeTriggerOnNetworkChanged(Timestamp at_time);
bool GetNetworkParameters(int32_t* estimated_bitrate_bps,
uint8_t* fraction_loss,
@@ -71,10 +71,10 @@
std::unique_ptr<AcknowledgedBitrateEstimator> acknowledged_bitrate_estimator_;
std::deque<int64_t> feedback_rtts_;
- rtc::Optional<int64_t> min_feedback_rtt_ms_;
+ absl::optional<int64_t> min_feedback_rtt_ms_;
DataRate last_bandwidth_;
- rtc::Optional<TargetTransferRate> last_target_rate_;
+ absl::optional<TargetTransferRate> last_target_rate_;
int32_t last_estimated_bitrate_bps_ = 0;
uint8_t last_estimated_fraction_loss_ = 0;
@@ -89,7 +89,7 @@
int64_t accepted_queue_ms_;
bool previously_in_alr = false;
- rtc::Optional<DataSize> current_data_window_;
+ absl::optional<DataSize> current_data_window_;
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(GoogCcNetworkController);
};
diff --git a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
index c929306..17e4aca 100644
--- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
+++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
@@ -170,9 +170,9 @@
return *estimated_bitrate_bps_;
}
-rtc::Optional<int>
+absl::optional<int>
ProbeBitrateEstimator::FetchAndResetLastEstimatedBitrateBps() {
- rtc::Optional<int> estimated_bitrate_bps = estimated_bitrate_bps_;
+ absl::optional<int> estimated_bitrate_bps = estimated_bitrate_bps_;
estimated_bitrate_bps_.reset();
return estimated_bitrate_bps;
}
diff --git a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h
index 55738d8..ed92521 100644
--- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h
+++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h
@@ -28,7 +28,7 @@
// Returns the estimated bitrate if the probe completes a valid cluster.
int HandleProbeAndEstimateBitrate(const PacketFeedback& packet_feedback);
- rtc::Optional<int> FetchAndResetLastEstimatedBitrateBps();
+ absl::optional<int> FetchAndResetLastEstimatedBitrateBps();
private:
struct AggregatedCluster {
@@ -47,7 +47,7 @@
std::map<int, AggregatedCluster> clusters_;
RtcEventLog* const event_log_;
- rtc::Optional<int> estimated_bitrate_bps_;
+ absl::optional<int> estimated_bitrate_bps_;
};
} // namespace webrtc
diff --git a/modules/congestion_controller/goog_cc/probe_controller.cc b/modules/congestion_controller/goog_cc/probe_controller.cc
index c05c094..fbc0620 100644
--- a/modules/congestion_controller/goog_cc/probe_controller.cc
+++ b/modules/congestion_controller/goog_cc/probe_controller.cc
@@ -209,7 +209,7 @@
}
void ProbeController::SetAlrStartTimeMs(
- rtc::Optional<int64_t> alr_start_time_ms) {
+ absl::optional<int64_t> alr_start_time_ms) {
alr_start_time_ms_ = alr_start_time_ms;
}
void ProbeController::SetAlrEndedTimeMs(int64_t alr_end_time_ms) {
diff --git a/modules/congestion_controller/goog_cc/probe_controller.h b/modules/congestion_controller/goog_cc/probe_controller.h
index 163ccb2..c8946e8 100644
--- a/modules/congestion_controller/goog_cc/probe_controller.h
+++ b/modules/congestion_controller/goog_cc/probe_controller.h
@@ -16,7 +16,7 @@
#include <initializer_list>
#include <vector>
-#include "api/optional.h"
+#include "absl/types/optional.h"
#include "api/transport/network_control.h"
#include "rtc_base/constructormagic.h"
@@ -50,7 +50,7 @@
void EnablePeriodicAlrProbing(bool enable);
- void SetAlrStartTimeMs(rtc::Optional<int64_t> alr_start_time);
+ void SetAlrStartTimeMs(absl::optional<int64_t> alr_start_time);
void SetAlrEndedTimeMs(int64_t alr_end_time);
void RequestProbe(int64_t at_time_ms);
@@ -86,8 +86,8 @@
int64_t start_bitrate_bps_;
int64_t max_bitrate_bps_;
int64_t last_bwe_drop_probing_time_ms_;
- rtc::Optional<int64_t> alr_start_time_ms_;
- rtc::Optional<int64_t> alr_end_time_ms_;
+ absl::optional<int64_t> alr_start_time_ms_;
+ absl::optional<int64_t> alr_end_time_ms_;
bool enable_periodic_alr_probing_;
int64_t time_of_last_large_drop_ms_;
int64_t bitrate_before_last_large_drop_bps_;
diff --git a/modules/congestion_controller/goog_cc/probe_controller_unittest.cc b/modules/congestion_controller/goog_cc/probe_controller_unittest.cc
index 4a61e67..ffa131d 100644
--- a/modules/congestion_controller/goog_cc/probe_controller_unittest.cc
+++ b/modules/congestion_controller/goog_cc/probe_controller_unittest.cc
@@ -161,7 +161,7 @@
probe_controller_->SetEstimatedBitrate(500, NowMs());
EXPECT_EQ(probe_controller_->GetAndResetPendingProbes().size(), 2u);
- probe_controller_->SetAlrStartTimeMs(rtc::nullopt);
+ probe_controller_->SetAlrStartTimeMs(absl::nullopt);
clock_.AdvanceTimeMilliseconds(kAlrProbeInterval + 1);
probe_controller_->Process(NowMs());
probe_controller_->SetEstimatedBitrate(250, NowMs());
@@ -181,7 +181,7 @@
probe_controller_->SetEstimatedBitrate(500, NowMs());
EXPECT_EQ(probe_controller_->GetAndResetPendingProbes().size(), 2u);
- probe_controller_->SetAlrStartTimeMs(rtc::nullopt);
+ probe_controller_->SetAlrStartTimeMs(absl::nullopt);
clock_.AdvanceTimeMilliseconds(kAlrProbeInterval + 1);
probe_controller_->Process(NowMs());
probe_controller_->SetEstimatedBitrate(250, NowMs());
diff --git a/modules/congestion_controller/goog_cc/trendline_estimator.cc b/modules/congestion_controller/goog_cc/trendline_estimator.cc
index d69ea3f..14aae95 100644
--- a/modules/congestion_controller/goog_cc/trendline_estimator.cc
+++ b/modules/congestion_controller/goog_cc/trendline_estimator.cc
@@ -14,7 +14,7 @@
#include <algorithm>
-#include "api/optional.h"
+#include "absl/types/optional.h"
#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
#include "rtc_base/checks.h"
#include "rtc_base/numerics/safe_minmax.h"
@@ -22,7 +22,7 @@
namespace webrtc {
namespace {
-rtc::Optional<double> LinearFitSlope(
+absl::optional<double> LinearFitSlope(
const std::deque<std::pair<double, double>>& points) {
RTC_DCHECK(points.size() >= 2);
// Compute the "center of mass".
@@ -42,7 +42,7 @@
denominator += (point.first - x_avg) * (point.first - x_avg);
}
if (denominator == 0)
- return rtc::nullopt;
+ return absl::nullopt;
return numerator / denominator;
}