Integrate Intelligibility with APM

webrtc/modules/audio_processing/audio_processing_impl.h

Index: webrtc/modules/audio_processing/audio_processing_impl.h
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h
index bbd17191585037e9fa739a1390f5013023a4ba8e..92a8bd2fac56115b5be1b6ad4bc7200656ae423b 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.h
+++ b/webrtc/modules/audio_processing/audio_processing_impl.h
@@ -38,6 +38,7 @@ class NoiseSuppressionImpl;
 class ProcessingComponent;
 class TransientSuppressor;
 class VoiceDetectionImpl;
+class IntelligibilityEnhancer;
 
 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
 namespace audioproc {
@@ -119,7 +120,7 @@ class AudioProcessingImpl : public AudioProcessing {
                     ChannelLayout output_layout,
                     float* const* dest) override;
   int AnalyzeReverseStream(AudioFrame* frame) override;
-  int AnalyzeReverseStream(const float* const* data,
+  int AnalyzeReverseStream(float* const* data,
                            int samples_per_channel,
                            int sample_rate_hz,
                            ChannelLayout layout) override;
@@ -172,6 +173,7 @@ class AudioProcessingImpl : public AudioProcessing {
   void InitializeExperimentalAgc() EXCLUSIVE_LOCKS_REQUIRED(crit_);
   void InitializeTransient() EXCLUSIVE_LOCKS_REQUIRED(crit_);
   void InitializeBeamformer() EXCLUSIVE_LOCKS_REQUIRED(crit_);
+  void InitializeIntelligibility() EXCLUSIVE_LOCKS_REQUIRED(crit_);
   void MaybeUpdateHistograms() EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   EchoCancellationImpl* echo_cancellation_;
@@ -230,6 +232,9 @@ class AudioProcessingImpl : public AudioProcessing {
   const std::vector<Point> array_geometry_;
 
   const bool supports_48kHz_;
+
+  bool intelligibility_enabled_;
+  rtc::scoped_ptr<IntelligibilityEnhancer> intelligibility_enhancer_;
 };
 
 }  // namespace webrtc