Re-land r9378 "Rename APM Config DelayCorrection to ExtendedFilter"

talk/app/webrtc/localaudiosource.cc

 /*
  * libjingle
  * Copyright 2013 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 25 matching lines @@
 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) {
-  MediaConstraintsInterface::Constraints::const_iterator iter;
-
   // 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.
-  for (iter = constraints.begin(); iter != constraints.end(); ++iter) {
+  for (const auto& constraint : constraints) {
     bool value = false;
 
-    if (!rtc::FromString(iter->value, &value))
+    if (!rtc::FromString(constraint.value, &value))
       continue;
 
-    if (iter->key == MediaConstraintsInterface::kEchoCancellation)
-      options->echo_cancellation.Set(value);
-    else if (iter->key ==
-        MediaConstraintsInterface::kExperimentalEchoCancellation)
-      options->experimental_aec.Set(value);
-    else if (iter->key == MediaConstraintsInterface::kDAEchoCancellation)
-      options->delay_agnostic_aec.Set(value);
-    else if (iter->key == MediaConstraintsInterface::kAutoGainControl)
-      options->auto_gain_control.Set(value);
-    else if (iter->key ==
-        MediaConstraintsInterface::kExperimentalAutoGainControl)
-      options->experimental_agc.Set(value);
-    else if (iter->key == MediaConstraintsInterface::kNoiseSuppression)
-      options->noise_suppression.Set(value);
-    else if (iter->key ==
-          MediaConstraintsInterface::kExperimentalNoiseSuppression)
-      options->experimental_ns.Set(value);
-    else if (iter->key == MediaConstraintsInterface::kHighpassFilter)
-      options->highpass_filter.Set(value);
-    else if (iter->key == MediaConstraintsInterface::kTypingNoiseDetection)
-      options->typing_detection.Set(value);
-    else if (iter->key == MediaConstraintsInterface::kAudioMirroring)
-      options->stereo_swapping.Set(value);
-    else if (iter->key == MediaConstraintsInterface::kAecDump)
-      options->aec_dump.Set(value);
+    struct {
+      const char* name;
+      cricket::Settable<bool>& value;
+    } key_to_value[] = {

[tommi, 2015/06/09 08:50:11]

You could move this outside the loop (e.g. top of function)

[hlundin-webrtc, 2015/06/09 09:02:09]

Done.

+        {MediaConstraintsInterface::kEchoCancellation,
+         options->echo_cancellation},
+        // Both kExperimentalEchoCancellation (old) and
+        // kExtendedFilterEchoCancellation (new) translate to
+        // extended_filter_aec
+        // option being set. This is to manage the transition from the old to
+        // the
+        // new without breaking dependent code.
+        {MediaConstraintsInterface::kExperimentalEchoCancellation,
+         options->extended_filter_aec},
+        {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::kHighpassFilter, options->highpass_filter},
+        {MediaConstraintsInterface::kTypingNoiseDetection,
+         options->typing_detection},
+        {MediaConstraintsInterface::kAudioMirroring, options->stereo_swapping},
+        {MediaConstraintsInterface::kAecDump, options->aec_dump}};

[tommi, 2015/06/09 08:50:11]

nit: Move }; to the next line

[hlundin-webrtc, 2015/06/09 09:02:09]

Nope. This is clang format. I'm not fighting that windmill...

[hlundin-webrtc, 2015/06/09 14:00:18]

Ok, ok. I picked a fight with the windmill anyway...

[kwiberg-webrtc, 2015/06/09 14:16:37]

Don't worry---I'm sure it'll be a breeze!

+
+    for (auto& entry : key_to_value) {
+      if (constraint.key.compare(entry.name) == 0)
+        entry.value.Set(value);
+    }
   }
 }
 
 }  // namespace
 
 rtc::scoped_refptr<LocalAudioSource> LocalAudioSource::Create(
     const PeerConnectionFactoryInterface::Options& options,
     const MediaConstraintsInterface* constraints) {
   rtc::scoped_refptr<LocalAudioSource> source(
       new rtc::RefCountedObject<LocalAudioSource>());
@@ skipping 11 matching lines @@
   // constraints.
   FromConstraints(constraints->GetOptional(), &options_);
 
   cricket::AudioOptions mandatory_options;
   FromConstraints(constraints->GetMandatory(), &mandatory_options);
   options_.SetAll(mandatory_options);
   source_state_ = kLive;
 }
 
 }  // namespace webrtc