Stop using deprecated constraints-based version of CreateAudioSource.

webrtc/api/localaudiosource.cc

Index: webrtc/api/localaudiosource.cc
diff --git a/webrtc/api/localaudiosource.cc b/webrtc/api/localaudiosource.cc
index 70035fececf80bf97647a4292754e79fbc0050f1..57cfdf8fd49460ca89793974032b07b64d555de9 100644
--- a/webrtc/api/localaudiosource.cc
+++ b/webrtc/api/localaudiosource.cc
@@ -20,78 +20,6 @@ using webrtc::MediaSourceInterface;
 
 namespace webrtc {
 
-namespace {
-
-// Convert constraints to audio options. Return false if constraints are
-// invalid.
-void FromConstraints(const MediaConstraintsInterface::Constraints& constraints,
-                     cricket::AudioOptions* options) {
-  // This design relies on the fact that all the audio constraints are actually
-  // "options", i.e. boolean-valued and always satisfiable.  If the constraints
-  // are extended to include non-boolean values or actual format constraints,
-  // a different algorithm will be required.
-  struct {
-    const char* name;
-    rtc::Optional<bool>& value;
-  } key_to_value[] = {
-      {MediaConstraintsInterface::kGoogEchoCancellation,
-       options->echo_cancellation},
-      {MediaConstraintsInterface::kExtendedFilterEchoCancellation,
-       options->extended_filter_aec},
-      {MediaConstraintsInterface::kDAEchoCancellation,
-       options->delay_agnostic_aec},
-      {MediaConstraintsInterface::kAutoGainControl, options->auto_gain_control},
-      {MediaConstraintsInterface::kExperimentalAutoGainControl,
-       options->experimental_agc},
-      {MediaConstraintsInterface::kNoiseSuppression,
-       options->noise_suppression},
-      {MediaConstraintsInterface::kExperimentalNoiseSuppression,
-       options->experimental_ns},
-      {MediaConstraintsInterface::kIntelligibilityEnhancer,
-       options->intelligibility_enhancer},
-      {MediaConstraintsInterface::kLevelControl, options->level_control},
-      {MediaConstraintsInterface::kHighpassFilter, options->highpass_filter},
-      {MediaConstraintsInterface::kTypingNoiseDetection,
-       options->typing_detection},
-      {MediaConstraintsInterface::kAudioMirroring, options->stereo_swapping}
-  };
-
-  for (const auto& constraint : constraints) {
-    // Set non-boolean constraints.
-    if (0 == constraint.key.compare(
-            MediaConstraintsInterface::kLevelControlInitialPeakLevelDBFS)) {
-      float level_control_initial_peak_level_dbfs = 0.0f;
-      if (rtc::FromString(constraint.value,
-                          &level_control_initial_peak_level_dbfs)) {
-        options->level_control_initial_peak_level_dbfs =
-            rtc::Optional<float>(level_control_initial_peak_level_dbfs);
-      }
-      continue;
-    }
-    if (constraint.key.compare(
-            MediaConstraintsInterface::kAudioNetworkAdaptorConfig) == 0) {
-      // When |kAudioNetworkAdaptorConfig| is defined, it both means that audio
-      // network adaptor is desired, and provides the config string.
-      options->audio_network_adaptor = rtc::Optional<bool>(true);
-      options->audio_network_adaptor_config =
-          rtc::Optional<std::string>(constraint.value);
-      continue;
-    }
-
-    // Parse boolean value.
-    bool value = false;
-    if (!rtc::FromString(constraint.value, &value))
-      continue;
-
-    for (auto& entry : key_to_value) {
-      if (constraint.key.compare(entry.name) == 0)
-        entry.value = rtc::Optional<bool>(value);
-    }
-  }
-}
-
-}  // namespace
-
 rtc::scoped_refptr<LocalAudioSource> LocalAudioSource::Create(
     const PeerConnectionFactoryInterface::Options& options,
     const MediaConstraintsInterface* constraints) {
@@ -113,16 +41,7 @@ rtc::scoped_refptr<LocalAudioSource> LocalAudioSource::Create(
 void LocalAudioSource::Initialize(
     const PeerConnectionFactoryInterface::Options& options,
     const MediaConstraintsInterface* constraints) {
-  if (!constraints)
-    return;
-
-  // Apply optional constraints first, they will be overwritten by mandatory
-  // constraints.
-  FromConstraints(constraints->GetOptional(), &options_);
-
-  cricket::AudioOptions mandatory_options;
-  FromConstraints(constraints->GetMandatory(), &mandatory_options);
-  options_.SetAll(mandatory_options);
+  CopyConstraintsIntoAudioOptions(constraints, &options_);
 }
 
 void LocalAudioSource::Initialize(