Integrate Intelligibility with APM

webrtc/modules/audio_processing/include/audio_processing.h

Index: webrtc/modules/audio_processing/include/audio_processing.h
diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h
index 6fa1c96c0771c14d141836dc0c88bf69ec9f5aea..bcb686c29cba274a5c665bb147c66a2c273a993e 100644
--- a/webrtc/modules/audio_processing/include/audio_processing.h
+++ b/webrtc/modules/audio_processing/include/audio_processing.h
@@ -122,6 +122,14 @@ struct AudioProcessing48kHzSupport {
   bool enabled;
 };
 
+// Use to enable intelligibility enhancer in audio processing. It can be set
+// in the constructor or using AudioProcessing::SetExtraOptions().

[Andrew MacDonald, 2015/07/21 19:29:22]

Please don't allow it to be set through SetExtraOptions. We want to remove this
method. I realize this won't allow you to enable it through voice engine for
now, but I think that's an acceptable compromise.

[Andrew MacDonald, 2015/07/22 02:09:48]

Ah, my mistake. You can still enable it in voice engine, but it makes it harder
through the crappy voe_cmd_test. Put up a CL here which shows how you could do
it through agc_harness at least:
https://codereview.webrtc.org/1247033006/

[ekm, 2015/07/23 00:26:28]

Got it. Thanks for the pointer. Can also at least enable it in voe_cmd_test at
compile time. On a similar note, what's the status of the Enable method that
several of the apm components provide?

+struct Intelligibility {
+  Intelligibility() : enabled(false) {}
+  explicit Intelligibility(bool enabled) : enabled(enabled) {}
+  bool enabled;
+};
+
 static const int kAudioProcMaxNativeSampleRateHz = 32000;
 
 // The Audio Processing Module (APM) provides a collection of voice processing
@@ -323,7 +331,14 @@ class AudioProcessing {
   // of |data| points to a channel buffer, arranged according to |layout|.
   virtual int AnalyzeReverseStream(const float* const* data,
                                    int samples_per_channel,
-                                   int sample_rate_hz,
+                                   int rev_sample_rate_hz,
+                                   ChannelLayout layout) = 0;
+
+  // Same as AnalyzeReverseStream, but may modify |data| if intelligibility
+  // is enabled.
+  virtual int ProcessReverseStream(float* const* data,
+                                   int samples_per_channel,
+                                   int rev_sample_rate_hz,
                                    ChannelLayout layout) = 0;
 
   // This must be called if and only if echo processing is enabled.