Integrate Intelligibility with APM

webrtc/modules/audio_processing/intelligibility/intelligibility_utils.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 101 matching lines @@
   // Sample history for the rolling window in kStepWindowed and block-wise
   // histories for kStepBlocked.
   rtc::scoped_ptr<rtc::scoped_ptr<std::complex<float>[]>[]> history_;
   rtc::scoped_ptr<rtc::scoped_ptr<std::complex<float>[]>[]> subhistory_;
   rtc::scoped_ptr<rtc::scoped_ptr<std::complex<float>[]>[]> subhistory_sq_;
 
   // The current set of variances and sums for Welford's algorithm.
   rtc::scoped_ptr<float[]> variance_;
   rtc::scoped_ptr<float[]> conj_sum_;
 
-  const int freqs_;
+  const int num_freqs_;
   const int window_size_;
   const float decay_;
   int history_cursor_;
   int count_;
   float array_mean_;
   bool buffer_full_;
   void (VarianceArray::*step_func_)(const std::complex<float>*, bool);
 };
 
 // Helper class for smoothing gain changes. On each applicatiion step, the
 // currently used gains are changed towards a set of settable target gains,
 // constrained by a limit on the magnitude of the changes.
 class GainApplier {
  public:
   GainApplier(int freqs, float change_limit);
 
   // Copy |in_block| to |out_block|, multiplied by the current set of gains,
   // and step the current set of gains towards the target set.
   void Apply(const std::complex<float>* in_block,
              std::complex<float>* out_block);
 
   // Return the current target gain set. Modify this array to set the targets.
   float* target() const { return target_.get(); }
 
  private:
-  const int freqs_;
+  const int num_freqs_;
   const float change_limit_;
   rtc::scoped_ptr<float[]> target_;
   rtc::scoped_ptr<float[]> current_;
 };
 
 }  // namespace intelligibility
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_UTILS_H_