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 passing top level directories except rtc_base and api find $@ -type f \( -name \*.h -o -name \*.cc -o -name \*.mm \) \ -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: I9465c172e65ba6e6ed4e4fdc35b0b265038d6f71 Reviewed-on: https://webrtc-review.googlesource.com/84584 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23697}
This commit is contained in:

committed by
Commit Bot

parent
ae810c10b4
commit
196100efa6
@ -64,7 +64,6 @@ rtc_static_library("common_audio") {
|
||||
":sinc_resampler",
|
||||
"..:webrtc_common",
|
||||
"../:typedefs",
|
||||
"../api:optional",
|
||||
"../rtc_base:checks",
|
||||
"../rtc_base:gtest_prod",
|
||||
"../rtc_base:rtc_base_approved",
|
||||
@ -72,6 +71,7 @@ rtc_static_library("common_audio") {
|
||||
"../rtc_base/memory:aligned_malloc",
|
||||
"../system_wrappers",
|
||||
"../system_wrappers:cpu_features_api",
|
||||
"//third_party/abseil-cpp/absl/types:optional",
|
||||
]
|
||||
|
||||
defines = []
|
||||
|
@ -19,7 +19,7 @@ namespace webrtc {
|
||||
class MockSmoothingFilter : public SmoothingFilter {
|
||||
public:
|
||||
MOCK_METHOD1(AddSample, void(float));
|
||||
MOCK_METHOD0(GetAverage, rtc::Optional<float>());
|
||||
MOCK_METHOD0(GetAverage, absl::optional<float>());
|
||||
MOCK_METHOD1(SetTimeConstantMs, bool(int));
|
||||
};
|
||||
|
||||
|
@ -52,10 +52,10 @@ void SmoothingFilterImpl::AddSample(float sample) {
|
||||
last_sample_ = sample;
|
||||
}
|
||||
|
||||
rtc::Optional<float> SmoothingFilterImpl::GetAverage() {
|
||||
absl::optional<float> SmoothingFilterImpl::GetAverage() {
|
||||
if (!init_end_time_ms_) {
|
||||
// |init_end_time_ms_| undefined since we have not received any sample.
|
||||
return rtc::nullopt;
|
||||
return absl::nullopt;
|
||||
}
|
||||
ExtrapolateLastSample(rtc::TimeMillis());
|
||||
return state_;
|
||||
|
@ -11,7 +11,7 @@
|
||||
#ifndef COMMON_AUDIO_SMOOTHING_FILTER_H_
|
||||
#define COMMON_AUDIO_SMOOTHING_FILTER_H_
|
||||
|
||||
#include "api/optional.h"
|
||||
#include "absl/types/optional.h"
|
||||
#include "rtc_base/constructormagic.h"
|
||||
#include "system_wrappers/include/clock.h"
|
||||
|
||||
@ -21,7 +21,7 @@ class SmoothingFilter {
|
||||
public:
|
||||
virtual ~SmoothingFilter() = default;
|
||||
virtual void AddSample(float sample) = 0;
|
||||
virtual rtc::Optional<float> GetAverage() = 0;
|
||||
virtual absl::optional<float> GetAverage() = 0;
|
||||
virtual bool SetTimeConstantMs(int time_constant_ms) = 0;
|
||||
};
|
||||
|
||||
@ -44,7 +44,7 @@ class SmoothingFilterImpl final : public SmoothingFilter {
|
||||
~SmoothingFilterImpl() override;
|
||||
|
||||
void AddSample(float sample) override;
|
||||
rtc::Optional<float> GetAverage() override;
|
||||
absl::optional<float> GetAverage() override;
|
||||
bool SetTimeConstantMs(int time_constant_ms) override;
|
||||
|
||||
// Methods used for unittests.
|
||||
@ -58,7 +58,7 @@ class SmoothingFilterImpl final : public SmoothingFilter {
|
||||
const float init_factor_;
|
||||
const float init_const_;
|
||||
|
||||
rtc::Optional<int64_t> init_end_time_ms_;
|
||||
absl::optional<int64_t> init_end_time_ms_;
|
||||
float last_sample_;
|
||||
float alpha_;
|
||||
float state_;
|
||||
|
Reference in New Issue
Block a user