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

webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 54 matching lines @@
     kCaptureStream,  // Noise stream.
   };
 
   // Provides access point to the frequency domain.
   class TransformCallback : public LappedTransform::Callback {
    public:
     TransformCallback(IntelligibilityEnhancer* parent, AudioSource source);
 
     // All in frequency domain, receives input |in_block|, applies
     // intelligibility enhancement, and writes result to |out_block|.
-    virtual void ProcessAudioBlock(const std::complex<float>* const* in_block,
-                                   int in_channels,
-                                   int frames,
-                                   int out_channels,
-                                   std::complex<float>* const* out_block);
+    void ProcessAudioBlock(const std::complex<float>* const* in_block,
+                           int in_channels,
+                           int frames,
+                           int out_channels,
+                           std::complex<float>* const* out_block) override;
 
    private:
     IntelligibilityEnhancer* parent_;
     AudioSource source_;
   };
   friend class TransformCallback;
 
   // Sends streams to ProcessClearBlock or ProcessNoiseBlock based on source.
   void DispatchAudio(AudioSource source,
                      const std::complex<float>* in_block,
@@ skipping 21 matching lines @@
   // Negative gains are set to 0. Stores the results in |sols|.
   void SolveForGainsGivenLambda(float lambda, int start_freq, float* sols);
 
   // Computes variance across ERB filters from freq variance |var|.
   // Stores in |result|.
   void FilterVariance(const float* var, float* result);
 
   // Returns dot product of vectors specified by size |length| arrays |a|,|b|.
   static float DotProduct(const float* a, const float* b, int length);
 
-  static const int kErbResolution;
   static const int kWindowSizeMs;
   static const int kChunkSizeMs;
   static const int kAnalyzeRate;   // Default for |analysis_rate_|.
   static const int kVarianceRate;  // Default for |variance_rate_|.
   static const float kClipFreq;
   static const float kConfigRho;  // Default production and interpretation SNR.
   static const float kKbdAlpha;
   static const float kGainChangeLimit;
 
   const int freqs_;         // Num frequencies in frequency domain.
@@ skipping 37 matching lines @@
   // Note: VAD currently does not affect anything in IntelligibilityEnhancer.
   VadInst* vad_high_;
   VadInst* vad_low_;
   rtc::scoped_ptr<int16_t[]> vad_tmp_buffer_;
   bool has_voice_low_;  // Whether voice detected in speech stream.
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_ENHANCER_H_