diff --git a/test/fuzzers/audio_processing_fuzzer.cc b/test/fuzzers/audio_processing_fuzzer.cc index 9879106f54..a44d446096 100644 --- a/test/fuzzers/audio_processing_fuzzer.cc +++ b/test/fuzzers/audio_processing_fuzzer.cc @@ -125,9 +125,9 @@ void FuzzAudioProcessing(const uint8_t* data, rtc::Optional ParseBool(const uint8_t** data, size_t* remaining_size) { if (1 > *remaining_size) { - return rtc::Optional(); + return rtc::nullopt; } - auto res = rtc::Optional((**data) % 2); + auto res = (**data) % 2; *data += 1; *remaining_size -= 1; return res; @@ -135,9 +135,9 @@ rtc::Optional ParseBool(const uint8_t** data, size_t* remaining_size) { rtc::Optional ParseByte(const uint8_t** data, size_t* remaining_size) { if (1 > *remaining_size) { - return rtc::Optional(); + return rtc::nullopt; } - auto res = rtc::Optional((**data)); + auto res = **data; *data += 1; *remaining_size -= 1; return res; diff --git a/test/fuzzers/neteq_rtp_fuzzer.cc b/test/fuzzers/neteq_rtp_fuzzer.cc index bf3ce93378..0f26367b68 100644 --- a/test/fuzzers/neteq_rtp_fuzzer.cc +++ b/test/fuzzers/neteq_rtp_fuzzer.cc @@ -66,7 +66,7 @@ class FuzzRtpInput : public NetEqInput { } rtc::Optional NextPacketTime() const override { - return rtc::Optional(packet_->time_ms); + return packet_->time_ms; } rtc::Optional NextOutputEventTime() const override { @@ -87,7 +87,7 @@ class FuzzRtpInput : public NetEqInput { rtc::Optional NextHeader() const override { RTC_DCHECK(packet_); - return rtc::Optional(packet_->header); + return packet_->header; } private: diff --git a/test/fuzzers/neteq_signal_fuzzer.cc b/test/fuzzers/neteq_signal_fuzzer.cc index f2fbf562a0..907e99ee7a 100644 --- a/test/fuzzers/neteq_signal_fuzzer.cc +++ b/test/fuzzers/neteq_signal_fuzzer.cc @@ -146,11 +146,11 @@ class FuzzSignalInput : public NetEqInput { } rtc::Optional NextPacketTime() const override { - return rtc::Optional(packet_->time_ms); + return packet_->time_ms; } rtc::Optional NextOutputEventTime() const override { - return rtc::Optional(next_output_event_ms_); + return next_output_event_ms_; } std::unique_ptr PopPacket() override { @@ -183,7 +183,7 @@ class FuzzSignalInput : public NetEqInput { rtc::Optional NextHeader() const override { RTC_DCHECK(packet_); - return rtc::Optional(packet_->header); + return packet_->header; } private: