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 40 matching lines @@
   // a different algorithm will be required.
   for (iter = constraints.begin(); iter != constraints.end(); ++iter) {
     bool value = false;
 
     if (!rtc::FromString(iter->value, &value))
       continue;
 
     if (iter->key == MediaConstraintsInterface::kEchoCancellation)
       options->echo_cancellation.Set(value);
     else if (iter->key ==
-        MediaConstraintsInterface::kExperimentalEchoCancellation)
-      options->experimental_aec.Set(value);
+                 MediaConstraintsInterface::kExperimentalEchoCancellation ||
+             iter->key ==
+                 MediaConstraintsInterface::kExtendedFilterEchoCancellation)

[tommi, 2015/06/08 16:41:34]

hmm... don't suppose you can start adding braces :-/  as is (and before) this
goes against the style guide.
Alternatively, you could do something like this:

struct {
  const char* name;
  Settable<bool>& value;
} key_to_value[] = {
  { 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->options->delay_agnostic_aec },
  ...etc
};

for (auto& entry : key_to_value) {
  if (iter->key.compare(entry.name) == 0)
    entry.value.Set(value);
}

I think it would also produce smaller code.

[hlundin-webrtc, 2015/06/09 08:42:51]

Like that?

+      // 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.
+      options->extended_filter_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 ==
@@ skipping 31 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