Miscellaneous changes split from https://codereview.webrtc.org/1230503003 .

webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc

Index: webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc
diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc
index 1e766875caedc519004077e4a2ebfc1f993c9262..9ed7bd288600ebd2ad32030d4ade579a4221f3a8 100644
--- a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc
+++ b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc
@@ -31,7 +31,6 @@ namespace webrtc {
 
 namespace {
 
-const int kErbResolution = 2;
 const int kWindowSizeMs = 2;
 const int kChunkSizeMs = 10;  // Size provided by APM.
 const float kClipFreq = 200.0f;
@@ -132,7 +131,7 @@ IntelligibilityEnhancer::IntelligibilityEnhancer(int erb_resolution,
   float freqs_khz = kClipFreq / 1000.0f;
   int erb_index = static_cast<int>(ceilf(
       11.17f * logf((freqs_khz + 0.312f) / (freqs_khz + 14.6575f)) + 43.0f));
-  start_freq_ = max(1, erb_index * kErbResolution);
+  start_freq_ = std::max(1, erb_index * erb_resolution);

[aluebs-webrtc, 2015/07/16 21:03:40]

This looks right to me, but it will change the behavior. Could you please
double-check with ekmeyerson or turajs, they are working on this.

[ekm, 2015/07/16 21:37:18]

This is fine; still achieves the desired behavior. Note: We are reworking things
slightly differently in another CL (https://codereview.webrtc.org/1234463003/).

 
   WindowGenerator::KaiserBesselDerived(kKbdAlpha, window_size_,
                                        kbd_window_.get());