Remove rtc::Optional alias and api:optional target
Update left-overs where old target still was used.
Bug: webrtc:9078
Change-Id: I2162c928091fc4ff1dea33a3f03adbe47207d206
Reviewed-on: https://webrtc-review.googlesource.com/84740
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23913}
diff --git a/modules/audio_coding/neteq/tools/neteq_input.cc b/modules/audio_coding/neteq/tools/neteq_input.cc
index 12a75fc..fed3ecc 100644
--- a/modules/audio_coding/neteq/tools/neteq_input.cc
+++ b/modules/audio_coding/neteq/tools/neteq_input.cc
@@ -34,12 +34,12 @@
start_time_ms_(input_->NextEventTime()),
duration_ms_(duration_ms) {}
-rtc::Optional<int64_t> TimeLimitedNetEqInput::NextPacketTime() const {
- return ended_ ? rtc::Optional<int64_t>() : input_->NextPacketTime();
+absl::optional<int64_t> TimeLimitedNetEqInput::NextPacketTime() const {
+ return ended_ ? absl::nullopt : input_->NextPacketTime();
}
-rtc::Optional<int64_t> TimeLimitedNetEqInput::NextOutputEventTime() const {
- return ended_ ? rtc::Optional<int64_t>() : input_->NextOutputEventTime();
+absl::optional<int64_t> TimeLimitedNetEqInput::NextOutputEventTime() const {
+ return ended_ ? absl::nullopt : input_->NextOutputEventTime();
}
std::unique_ptr<NetEqInput::PacketData> TimeLimitedNetEqInput::PopPacket() {
@@ -62,8 +62,8 @@
return ended_ || input_->ended();
}
-rtc::Optional<RTPHeader> TimeLimitedNetEqInput::NextHeader() const {
- return ended_ ? rtc::Optional<RTPHeader>() : input_->NextHeader();
+absl::optional<RTPHeader> TimeLimitedNetEqInput::NextHeader() const {
+ return ended_ ? absl::nullopt : input_->NextHeader();
}
void TimeLimitedNetEqInput::MaybeSetEnded() {