Rename Maybe to Optional

webrtc/modules/audio_coding/main/acm2/rent_a_codec.h

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_RENT_A_CODEC_H_
 #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_RENT_A_CODEC_H_
 
 #include <stddef.h>
 
 #include "webrtc/base/array_view.h"
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/base/maybe.h"
+#include "webrtc/base/optional.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
 
 #if defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)
 #include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h"
 #else
 // Dummy implementation, for when we don't have iSAC.
 namespace webrtc {
@@ skipping 108 matching lines @@
     kDecoderCNGswb48kHz,
     kDecoderArbitrary,
     kDecoderOpus,
     kDecoderOpus_2ch,
   };
 
   static inline size_t NumberOfCodecs() {
     return static_cast<size_t>(CodecId::kNumCodecs);
   }
 
-  static inline rtc::Maybe<int> CodecIndexFromId(CodecId codec_id) {
+  static inline rtc::Optional<int> CodecIndexFromId(CodecId codec_id) {
     const int i = static_cast<int>(codec_id);
-    return i >= 0 && i < static_cast<int>(NumberOfCodecs()) ? rtc::Maybe<int>(i)
-                                                            : rtc::Maybe<int>();
+    return i >= 0 && i < static_cast<int>(NumberOfCodecs())
+               ? rtc::Optional<int>(i)
+               : rtc::Optional<int>();
   }
 
-  static inline rtc::Maybe<CodecId> CodecIdFromIndex(int codec_index) {
+  static inline rtc::Optional<CodecId> CodecIdFromIndex(int codec_index) {
     return static_cast<size_t>(codec_index) < NumberOfCodecs()
-               ? rtc::Maybe<RentACodec::CodecId>(
+               ? rtc::Optional<RentACodec::CodecId>(
                      static_cast<RentACodec::CodecId>(codec_index))
-               : rtc::Maybe<RentACodec::CodecId>();
+               : rtc::Optional<RentACodec::CodecId>();
   }
 
-  static rtc::Maybe<CodecId> CodecIdByParams(const char* payload_name,
-                                             int sampling_freq_hz,
-                                             int channels);
-  static rtc::Maybe<CodecInst> CodecInstById(CodecId codec_id);
-  static rtc::Maybe<CodecId> CodecIdByInst(const CodecInst& codec_inst);
-  static rtc::Maybe<CodecInst> CodecInstByParams(const char* payload_name,
-                                                 int sampling_freq_hz,
-                                                 int channels);
+  static rtc::Optional<CodecId> CodecIdByParams(const char* payload_name,
+                                                int sampling_freq_hz,
+                                                int channels);
+  static rtc::Optional<CodecInst> CodecInstById(CodecId codec_id);
+  static rtc::Optional<CodecId> CodecIdByInst(const CodecInst& codec_inst);
+  static rtc::Optional<CodecInst> CodecInstByParams(const char* payload_name,
+                                                    int sampling_freq_hz,
+                                                    int channels);
   static bool IsCodecValid(const CodecInst& codec_inst);
 
   static inline bool IsPayloadTypeValid(int payload_type) {
     return payload_type >= 0 && payload_type <= 127;
   }
 
   static rtc::ArrayView<const CodecInst> Database();
 
-  static rtc::Maybe<bool> IsSupportedNumChannels(CodecId codec_id,
-                                                 int num_channels);
+  static rtc::Optional<bool> IsSupportedNumChannels(CodecId codec_id,
+                                                    int num_channels);
 
-  static rtc::Maybe<NetEqDecoder> NetEqDecoderFromCodecId(CodecId codec_id,
-                                                          int num_channels);
+  static rtc::Optional<NetEqDecoder> NetEqDecoderFromCodecId(CodecId codec_id,
+                                                             int num_channels);
 
   RentACodec();
   ~RentACodec();
 
   // Creates and returns an audio encoder built to the given specification.
   // Returns null in case of error. The returned encoder is live until the next
   // successful call to this function, or until the Rent-A-Codec is destroyed.
   AudioEncoder* RentEncoder(const CodecInst& codec_inst);
 
   // Creates and returns an iSAC decoder, which will remain live until the
   // Rent-A-Codec is destroyed. Subsequent calls will simply return the same
   // object.
   AudioDecoder* RentIsacDecoder();
 
  private:
   rtc::scoped_ptr<AudioEncoder> encoder_;
   rtc::scoped_ptr<AudioDecoder> isac_decoder_;
   LockedIsacBandwidthInfo isac_bandwidth_info_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(RentACodec);
 };
 
 }  // namespace acm2
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_RENT_A_CODEC_H_