Replace rtc::cricket::Settable with rtc::Maybe

talk/media/webrtc/webrtcvoiceengine.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 350 matching lines @@
     RTC_DCHECK(voe_codec->plfreq != new_plfreq);
     voe_codec->plfreq = new_plfreq;
   }
 }
 
 // Gets the default set of options applied to the engine. Historically, these
 // were supplied as a combination of flags from the channel manager (ec, agc,
 // ns, and highpass) and the rest hardcoded in InitInternal.
 AudioOptions GetDefaultEngineOptions() {
   AudioOptions options;
-  options.echo_cancellation.Set(true);
-  options.auto_gain_control.Set(true);
-  options.noise_suppression.Set(true);
-  options.highpass_filter.Set(true);
-  options.stereo_swapping.Set(false);
-  options.audio_jitter_buffer_max_packets.Set(50);
-  options.audio_jitter_buffer_fast_accelerate.Set(false);
-  options.typing_detection.Set(true);
-  options.adjust_agc_delta.Set(0);
-  options.experimental_agc.Set(false);
-  options.extended_filter_aec.Set(false);
-  options.delay_agnostic_aec.Set(false);
-  options.experimental_ns.Set(false);
-  options.aec_dump.Set(false);
+  options.echo_cancellation = true;
+  options.auto_gain_control = true;
+  options.noise_suppression = true;
+  options.highpass_filter = true;
+  options.stereo_swapping = false;
+  options.audio_jitter_buffer_max_packets = 50;
+  options.audio_jitter_buffer_fast_accelerate = false;
+  options.typing_detection = true;
+  options.adjust_agc_delta = 0;
+  options.experimental_agc = false;
+  options.extended_filter_aec = false;
+  options.delay_agnostic_aec = false;
+  options.experimental_ns = false;
+  options.aec_dump = false;
   return options;
 }
 
 std::string GetEnableString(bool enable) {
   return enable ? "enable" : "disable";
 }
 } // namespace {
 
 WebRtcVoiceEngine::WebRtcVoiceEngine()
     : voe_wrapper_(new VoEWrapper()),
@@ skipping 217 matching lines @@
 // AudioOptions defaults are set in InitInternal (for options with corresponding
 // MediaEngineInterface flags) and in SetOptions(int) for flagless options.
 bool WebRtcVoiceEngine::ApplyOptions(const AudioOptions& options_in) {
   LOG(LS_INFO) << "ApplyOptions: " << options_in.ToString();
   AudioOptions options = options_in;  // The options are modified below.
   // kEcConference is AEC with high suppression.
   webrtc::EcModes ec_mode = webrtc::kEcConference;
   webrtc::AecmModes aecm_mode = webrtc::kAecmSpeakerphone;
   webrtc::AgcModes agc_mode = webrtc::kAgcAdaptiveAnalog;
   webrtc::NsModes ns_mode = webrtc::kNsHighSuppression;
-  bool aecm_comfort_noise = false;
-  if (options.aecm_generate_comfort_noise.Get(&aecm_comfort_noise)) {
+  if (options.aecm_generate_comfort_noise) {
     LOG(LS_VERBOSE) << "Comfort noise explicitly set to "
-                    << aecm_comfort_noise << " (default is false).";
+                    << *options.aecm_generate_comfort_noise
+                    << " (default is false).";
   }
 
 #if defined(IOS)
   // On iOS, VPIO provides built-in EC and AGC.
-  options.echo_cancellation.Set(false);
-  options.auto_gain_control.Set(false);
+  options.echo_cancellation = false;
+  options.auto_gain_control = false;
   LOG(LS_INFO) << "Always disable AEC and AGC on iOS. Use built-in instead.";
 #elif defined(ANDROID)
   ec_mode = webrtc::kEcAecm;
 #endif
 
 #if defined(IOS) || defined(ANDROID)
   // Set the AGC mode for iOS as well despite disabling it above, to avoid
   // unsupported configuration errors from webrtc.
   agc_mode = webrtc::kAgcFixedDigital;
-  options.typing_detection.Set(false);
-  options.experimental_agc.Set(false);
-  options.extended_filter_aec.Set(false);
-  options.experimental_ns.Set(false);
+  options.typing_detection = false;
+  options.experimental_agc = false;
+  options.extended_filter_aec = false;
+  options.experimental_ns = false;
 #endif
 
   // Delay Agnostic AEC automatically turns on EC if not set except on iOS
   // where the feature is not supported.
   bool use_delay_agnostic_aec = false;
 #if !defined(IOS)
-  if (options.delay_agnostic_aec.Get(&use_delay_agnostic_aec)) {
+  if (options.delay_agnostic_aec) {
+    use_delay_agnostic_aec = *options.delay_agnostic_aec;
     if (use_delay_agnostic_aec) {
-      options.echo_cancellation.Set(true);
-      options.extended_filter_aec.Set(true);
+      options.echo_cancellation = true;
+      options.extended_filter_aec = true;
       ec_mode = webrtc::kEcConference;
     }
   }
 #endif
 
   webrtc::VoEAudioProcessing* voep = voe_wrapper_->processing();
 
   bool echo_cancellation = false;

[the sun, 2015/10/28 13:18:01]

You can move this into the conditional below, right? Or use
*options.echo_cancellation throughout.

[kwiberg-webrtc, 2015/10/28 14:34:38]

Done.

-  if (options.echo_cancellation.Get(&echo_cancellation)) {
+  if (options.echo_cancellation) {
+    echo_cancellation = *options.echo_cancellation;
     // Check if platform supports built-in EC. Currently only supported on
     // Android and in combination with Java based audio layer.
     // TODO(henrika): investigate possibility to support built-in EC also
     // in combination with Open SL ES audio.
     const bool built_in_aec = voe_wrapper_->hw()->BuiltInAECIsAvailable();
     if (built_in_aec) {
       // Built-in EC exists on this device and use_delay_agnostic_aec is not
       // overriding it. Enable/Disable it according to the echo_cancellation
       // audio option.
       const bool enable_built_in_aec =
           echo_cancellation && !use_delay_agnostic_aec;
       if (voe_wrapper_->hw()->EnableBuiltInAEC(enable_built_in_aec) == 0 &&
           enable_built_in_aec) {
         // Disable internal software EC if built-in EC is enabled,
         // i.e., replace the software EC with the built-in EC.
-        options.echo_cancellation.Set(false);
+        options.echo_cancellation = false;
         echo_cancellation = false;
         LOG(LS_INFO) << "Disabling EC since built-in EC will be used instead";
       }
     }
     if (voep->SetEcStatus(echo_cancellation, ec_mode) == -1) {
       LOG_RTCERR2(SetEcStatus, echo_cancellation, ec_mode);
       return false;
     } else {
       LOG(LS_INFO) << "Echo control set to " << echo_cancellation
                    << " with mode " << ec_mode;
     }
 #if !defined(ANDROID)
     // TODO(ajm): Remove the error return on Android from webrtc.
     if (voep->SetEcMetricsStatus(echo_cancellation) == -1) {
       LOG_RTCERR1(SetEcMetricsStatus, echo_cancellation);
       return false;
     }
 #endif
     if (ec_mode == webrtc::kEcAecm) {
-      if (voep->SetAecmMode(aecm_mode, aecm_comfort_noise) != 0) {
-        LOG_RTCERR2(SetAecmMode, aecm_mode, aecm_comfort_noise);
+      bool cn = options.aecm_generate_comfort_noise.value_or(false);
+      if (voep->SetAecmMode(aecm_mode, cn) != 0) {
+        LOG_RTCERR2(SetAecmMode, aecm_mode, cn);
         return false;
       }
     }
   }
 
-  bool auto_gain_control = false;
-  if (options.auto_gain_control.Get(&auto_gain_control)) {
+  if (options.auto_gain_control) {
     const bool built_in_agc = voe_wrapper_->hw()->BuiltInAGCIsAvailable();
     if (built_in_agc) {
-      if (voe_wrapper_->hw()->EnableBuiltInAGC(auto_gain_control) == 0 &&
-          auto_gain_control) {
+      if (voe_wrapper_->hw()->EnableBuiltInAGC(*options.auto_gain_control) ==
+              0 &&

[the sun, 2015/10/28 13:18:01]

did git cl format do this?

[kwiberg-webrtc, 2015/10/28 14:34:38]

Yes. Interesting.

+          *options.auto_gain_control) {
         // Disable internal software AGC if built-in AGC is enabled,
         // i.e., replace the software AGC with the built-in AGC.
-        options.auto_gain_control.Set(false);
-        auto_gain_control = false;
+        options.auto_gain_control = false;
         LOG(LS_INFO) << "Disabling AGC since built-in AGC will be used instead";
       }
     }
-    if (voep->SetAgcStatus(auto_gain_control, agc_mode) == -1) {
-      LOG_RTCERR2(SetAgcStatus, auto_gain_control, agc_mode);
+    if (voep->SetAgcStatus(*options.auto_gain_control, agc_mode) == -1) {
+      LOG_RTCERR2(SetAgcStatus, *options.auto_gain_control, agc_mode);
       return false;
     } else {
-      LOG(LS_INFO) << "Auto gain set to " << auto_gain_control << " with mode "
-                   << agc_mode;
+      LOG(LS_INFO) << "Auto gain set to " << *options.auto_gain_control
+                   << " with mode " << agc_mode;
     }
   }
 
-  if (options.tx_agc_target_dbov.IsSet() ||
-      options.tx_agc_digital_compression_gain.IsSet() ||
-      options.tx_agc_limiter.IsSet()) {
+  if (options.tx_agc_target_dbov || options.tx_agc_digital_compression_gain ||
+      options.tx_agc_limiter) {
     // Override default_agc_config_. Generally, an unset option means "leave
     // the VoE bits alone" in this function, so we want whatever is set to be
     // stored as the new "default". If we didn't, then setting e.g.
     // tx_agc_target_dbov would reset digital compression gain and limiter
     // settings.
     // Also, if we don't update default_agc_config_, then adjust_agc_delta
     // would be an offset from the original values, and not whatever was set
     // explicitly.
-    default_agc_config_.targetLeveldBOv =
-        options.tx_agc_target_dbov.GetWithDefaultIfUnset(
-            default_agc_config_.targetLeveldBOv);
+    default_agc_config_.targetLeveldBOv = options.tx_agc_target_dbov.value_or(
+        default_agc_config_.targetLeveldBOv);
     default_agc_config_.digitalCompressionGaindB =
-        options.tx_agc_digital_compression_gain.GetWithDefaultIfUnset(
+        options.tx_agc_digital_compression_gain.value_or(
             default_agc_config_.digitalCompressionGaindB);
     default_agc_config_.limiterEnable =
-        options.tx_agc_limiter.GetWithDefaultIfUnset(
-            default_agc_config_.limiterEnable);
+        options.tx_agc_limiter.value_or(default_agc_config_.limiterEnable);
     if (voe_wrapper_->processing()->SetAgcConfig(default_agc_config_) == -1) {
       LOG_RTCERR3(SetAgcConfig,
                   default_agc_config_.targetLeveldBOv,
                   default_agc_config_.digitalCompressionGaindB,
                   default_agc_config_.limiterEnable);
       return false;
     }
   }
 
-  bool noise_suppression = false;
-  if (options.noise_suppression.Get(&noise_suppression)) {
+  if (options.noise_suppression) {
     const bool built_in_ns = voe_wrapper_->hw()->BuiltInNSIsAvailable();
     if (built_in_ns) {
-      if (voe_wrapper_->hw()->EnableBuiltInNS(noise_suppression) == 0 &&
-          noise_suppression) {
+      if (voe_wrapper_->hw()->EnableBuiltInNS(*options.noise_suppression) ==
+              0 &&
+          *options.noise_suppression) {
         // Disable internal software NS if built-in NS is enabled,
         // i.e., replace the software NS with the built-in NS.
-        options.noise_suppression.Set(false);
-        noise_suppression = false;
+        options.noise_suppression = false;
         LOG(LS_INFO) << "Disabling NS since built-in NS will be used instead";
       }
     }
-    if (voep->SetNsStatus(noise_suppression, ns_mode) == -1) {
-      LOG_RTCERR2(SetNsStatus, noise_suppression, ns_mode);
+    if (voep->SetNsStatus(*options.noise_suppression, ns_mode) == -1) {
+      LOG_RTCERR2(SetNsStatus, *options.noise_suppression, ns_mode);
       return false;
     } else {
-      LOG(LS_INFO) << "Noise suppression set to " << noise_suppression
+      LOG(LS_INFO) << "Noise suppression set to " << *options.noise_suppression
                    << " with mode " << ns_mode;
     }
   }
 
-  bool highpass_filter;
-  if (options.highpass_filter.Get(&highpass_filter)) {
-    LOG(LS_INFO) << "High pass filter enabled? " << highpass_filter;
-    if (voep->EnableHighPassFilter(highpass_filter) == -1) {
-      LOG_RTCERR1(SetHighpassFilterStatus, highpass_filter);
+  if (options.highpass_filter) {
+    LOG(LS_INFO) << "High pass filter enabled? " << *options.highpass_filter;
+    if (voep->EnableHighPassFilter(*options.highpass_filter) == -1) {
+      LOG_RTCERR1(SetHighpassFilterStatus, *options.highpass_filter);
       return false;
     }
   }
 
-  bool stereo_swapping;
-  if (options.stereo_swapping.Get(&stereo_swapping)) {
-    LOG(LS_INFO) << "Stereo swapping enabled? " << stereo_swapping;
-    voep->EnableStereoChannelSwapping(stereo_swapping);
-    if (voep->IsStereoChannelSwappingEnabled() != stereo_swapping) {
-      LOG_RTCERR1(EnableStereoChannelSwapping, stereo_swapping);
+  if (options.stereo_swapping) {
+    LOG(LS_INFO) << "Stereo swapping enabled? " << *options.stereo_swapping;
+    voep->EnableStereoChannelSwapping(*options.stereo_swapping);
+    if (voep->IsStereoChannelSwappingEnabled() != *options.stereo_swapping) {
+      LOG_RTCERR1(EnableStereoChannelSwapping, *options.stereo_swapping);
       return false;
     }
   }
 
-  int audio_jitter_buffer_max_packets;
-  if (options.audio_jitter_buffer_max_packets.Get(
-          &audio_jitter_buffer_max_packets)) {
-    LOG(LS_INFO) << "NetEq capacity is " << audio_jitter_buffer_max_packets;
+  if (options.audio_jitter_buffer_max_packets) {
+    LOG(LS_INFO) << "NetEq capacity is "
+                 << *options.audio_jitter_buffer_max_packets;
     voe_config_.Set<webrtc::NetEqCapacityConfig>(
-        new webrtc::NetEqCapacityConfig(audio_jitter_buffer_max_packets));
+        new webrtc::NetEqCapacityConfig(
+            *options.audio_jitter_buffer_max_packets));
   }
 
-  bool audio_jitter_buffer_fast_accelerate;
-  if (options.audio_jitter_buffer_fast_accelerate.Get(
-          &audio_jitter_buffer_fast_accelerate)) {
-    LOG(LS_INFO) << "NetEq fast mode? " << audio_jitter_buffer_fast_accelerate;
+  if (options.audio_jitter_buffer_fast_accelerate) {
+    LOG(LS_INFO) << "NetEq fast mode? "
+                 << *options.audio_jitter_buffer_fast_accelerate;
     voe_config_.Set<webrtc::NetEqFastAccelerate>(
-        new webrtc::NetEqFastAccelerate(audio_jitter_buffer_fast_accelerate));
+        new webrtc::NetEqFastAccelerate(
+            *options.audio_jitter_buffer_fast_accelerate));
   }
 
-  bool typing_detection;
-  if (options.typing_detection.Get(&typing_detection)) {
-    LOG(LS_INFO) << "Typing detection is enabled? " << typing_detection;
-    if (voep->SetTypingDetectionStatus(typing_detection) == -1) {
+  if (options.typing_detection) {
+    LOG(LS_INFO) << "Typing detection is enabled? "
+                 << *options.typing_detection;
+    if (voep->SetTypingDetectionStatus(*options.typing_detection) == -1) {
       // In case of error, log the info and continue
-      LOG_RTCERR1(SetTypingDetectionStatus, typing_detection);
+      LOG_RTCERR1(SetTypingDetectionStatus, *options.typing_detection);
     }
   }
 
-  int adjust_agc_delta;
-  if (options.adjust_agc_delta.Get(&adjust_agc_delta)) {
-    LOG(LS_INFO) << "Adjust agc delta is " << adjust_agc_delta;
-    if (!AdjustAgcLevel(adjust_agc_delta)) {
+  if (options.adjust_agc_delta) {
+    LOG(LS_INFO) << "Adjust agc delta is " << *options.adjust_agc_delta;
+    if (!AdjustAgcLevel(*options.adjust_agc_delta)) {
       return false;
     }
   }
 
-  bool aec_dump;
-  if (options.aec_dump.Get(&aec_dump)) {
-    LOG(LS_INFO) << "Aec dump is enabled? " << aec_dump;
-    if (aec_dump)
+  if (options.aec_dump) {
+    LOG(LS_INFO) << "Aec dump is enabled? " << *options.aec_dump;
+    if (*options.aec_dump)
       StartAecDump(kAecDumpByAudioOptionFilename);
     else
       StopAecDump();
   }
 
   webrtc::Config config;
 
-  delay_agnostic_aec_.SetFrom(options.delay_agnostic_aec);
-  bool delay_agnostic_aec;
-  if (delay_agnostic_aec_.Get(&delay_agnostic_aec)) {
-    LOG(LS_INFO) << "Delay agnostic aec is enabled? " << delay_agnostic_aec;
+  if (options.delay_agnostic_aec)
+    delay_agnostic_aec_ = options.delay_agnostic_aec;

[the sun, 2015/10/28 13:18:01]

nit: brackets, and below

[kwiberg-webrtc, 2015/10/28 14:34:38]

Done.

+  if (delay_agnostic_aec_) {
+    LOG(LS_INFO) << "Delay agnostic aec is enabled? " << *delay_agnostic_aec_;
     config.Set<webrtc::DelayAgnostic>(
-        new webrtc::DelayAgnostic(delay_agnostic_aec));
+        new webrtc::DelayAgnostic(*delay_agnostic_aec_));
   }
 
-  extended_filter_aec_.SetFrom(options.extended_filter_aec);
-  bool extended_filter;
-  if (extended_filter_aec_.Get(&extended_filter)) {
-    LOG(LS_INFO) << "Extended filter aec is enabled? " << extended_filter;
+  if (options.extended_filter_aec)
+    extended_filter_aec_ = options.extended_filter_aec;
+  if (extended_filter_aec_) {
+    LOG(LS_INFO) << "Extended filter aec is enabled? " << *extended_filter_aec_;
     config.Set<webrtc::ExtendedFilter>(
-        new webrtc::ExtendedFilter(extended_filter));
+        new webrtc::ExtendedFilter(*extended_filter_aec_));
   }
 
-  experimental_ns_.SetFrom(options.experimental_ns);
-  bool experimental_ns;
-  if (experimental_ns_.Get(&experimental_ns)) {
-    LOG(LS_INFO) << "Experimental ns is enabled? " << experimental_ns;
+  if (options.experimental_ns)
+    experimental_ns_ = options.experimental_ns;
+  if (experimental_ns_) {
+    LOG(LS_INFO) << "Experimental ns is enabled? " << *experimental_ns_;
     config.Set<webrtc::ExperimentalNs>(
-        new webrtc::ExperimentalNs(experimental_ns));
+        new webrtc::ExperimentalNs(*experimental_ns_));
   }
 
   // We check audioproc for the benefit of tests, since FakeWebRtcVoiceEngine
   // returns NULL on audio_processing().
   webrtc::AudioProcessing* audioproc = voe_wrapper_->base()->audio_processing();
   if (audioproc) {
     audioproc->SetExtraOptions(config);
   }
 
-  uint32_t recording_sample_rate;
-  if (options.recording_sample_rate.Get(&recording_sample_rate)) {
-    LOG(LS_INFO) << "Recording sample rate is " << recording_sample_rate;
-    if (voe_wrapper_->hw()->SetRecordingSampleRate(recording_sample_rate)) {
-      LOG_RTCERR1(SetRecordingSampleRate, recording_sample_rate);
+  if (options.recording_sample_rate) {
+    LOG(LS_INFO) << "Recording sample rate is "
+                 << *options.recording_sample_rate;
+    if (voe_wrapper_->hw()->SetRecordingSampleRate(
+            *options.recording_sample_rate)) {
+      LOG_RTCERR1(SetRecordingSampleRate, *options.recording_sample_rate);
     }
   }
 
-  uint32_t playout_sample_rate;
-  if (options.playout_sample_rate.Get(&playout_sample_rate)) {
-    LOG(LS_INFO) << "Playout sample rate is " << playout_sample_rate;
-    if (voe_wrapper_->hw()->SetPlayoutSampleRate(playout_sample_rate)) {
-      LOG_RTCERR1(SetPlayoutSampleRate, playout_sample_rate);
+  if (options.playout_sample_rate) {
+    LOG(LS_INFO) << "Playout sample rate is " << *options.playout_sample_rate;
+    if (voe_wrapper_->hw()->SetPlayoutSampleRate(
+            *options.playout_sample_rate)) {
+      LOG_RTCERR1(SetPlayoutSampleRate, *options.playout_sample_rate);
     }
   }
 
   return true;
 }
 
 // TODO(juberti): Refactor this so that the core logic can be used to set the
 // soundclip device. At that time, reinstate the soundclip pause/resume code.
 bool WebRtcVoiceEngine::SetDevices(const Device* in_device,
                                    const Device* out_device) {
@@ skipping 611 matching lines @@
   if (send_ != SEND_NOTHING) {
     if (!engine()->ApplyOptions(options_)) {
       LOG(LS_WARNING) <<
           "Failed to apply engine options during channel SetOptions.";
       return false;
     }
   }
 
   if (dscp_option_changed) {
     rtc::DiffServCodePoint dscp = rtc::DSCP_DEFAULT;
-    if (options_.dscp.GetWithDefaultIfUnset(false))
+    if (options_.dscp.value_or(false))
       dscp = kAudioDscpValue;
     if (MediaChannel::SetDscp(dscp) != 0) {
       LOG(LS_WARNING) << "Failed to set DSCP settings for audio channel";
     }
   }
 
   // TODO(solenberg): Don't recreate unless options changed.
   RecreateAudioReceiveStreams();
 
   LOG(LS_INFO) << "Set voice channel options.  Current options: "
@@ skipping 1322 matching lines @@
 void WebRtcVoiceMediaChannel::AddAudioReceiveStream(uint32_t ssrc) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   WebRtcAudioReceiveStream* stream = receive_channels_[ssrc];
   RTC_DCHECK(stream != nullptr);
   RTC_DCHECK(receive_streams_.find(ssrc) == receive_streams_.end());
   webrtc::AudioReceiveStream::Config config;
   config.rtp.remote_ssrc = ssrc;
   // Only add RTP extensions if we support combined A/V BWE.
   config.rtp.extensions = recv_rtp_extensions_;
   config.combined_audio_video_bwe =
-      options_.combined_audio_video_bwe.GetWithDefaultIfUnset(false);
+      options_.combined_audio_video_bwe.value_or(false);
   config.voe_channel_id = stream->channel();
   config.sync_group = receive_stream_params_[ssrc].sync_label;
   webrtc::AudioReceiveStream* s = call_->CreateAudioReceiveStream(config);
   receive_streams_.insert(std::make_pair(ssrc, s));
 }
 
 void WebRtcVoiceMediaChannel::RemoveAudioReceiveStream(uint32_t ssrc) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   auto stream_it = receive_streams_.find(ssrc);
   if (stream_it != receive_streams_.end()) {
@@ skipping 22 matching lines @@
       LOG(LS_WARNING) << "Unknown codec " << ToString(codec);
       return false;
     }
   }
   return true;
 }
 
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VOICE