Integrate Intelligibility with APM

webrtc/modules/audio_processing/audio_buffer.cc

Index: webrtc/modules/audio_processing/audio_buffer.cc
diff --git a/webrtc/modules/audio_processing/audio_buffer.cc b/webrtc/modules/audio_processing/audio_buffer.cc
index 04dcaea799d60af6bbc48d899e9ded8134d6ce03..f25309407da32c1c26065c6652365839e9ba123c 100644
--- a/webrtc/modules/audio_processing/audio_buffer.cc
+++ b/webrtc/modules/audio_processing/audio_buffer.cc
@@ -435,21 +435,40 @@ void AudioBuffer::DeinterleaveFrom(AudioFrame* frame) {
   }
 }
 
-void AudioBuffer::InterleaveTo(AudioFrame* frame, bool data_changed) const {
-  assert(proc_num_frames_ == output_num_frames_);
-  assert(num_channels_ == num_input_channels_);
-  assert(frame->num_channels_ == num_channels_);
-  assert(frame->samples_per_channel_ == proc_num_frames_);
+void AudioBuffer::InterleaveTo(AudioFrame* frame, bool data_changed) {
   frame->vad_activity_ = activity_;
-
   if (!data_changed) {
     return;
   }
 
-  Interleave(data_->ibuf()->channels(),
-             proc_num_frames_,
-             num_channels_,
-             frame->data_);
+  assert(frame->num_channels_ == num_channels_ || num_channels_ == 1);
+  assert(frame->samples_per_channel_ == output_num_frames_);
+
+  // Resample if necessary.
+  IFChannelBuffer* data_ptr;
+  if (proc_num_frames_ != output_num_frames_) {
+    if (!output_buffer_) {
+      output_buffer_.reset(
+        new IFChannelBuffer(output_num_frames_, num_channels_));
+    }
+    for (int i = 0; i < num_channels_; ++i) {
+      output_resamplers_[i]->Resample(data_->fbuf()->channels()[i],
+                                      proc_num_frames_,
+                                      output_buffer_->fbuf()->channels()[i],
+                                      output_num_frames_);
+    }
+    data_ptr = output_buffer_.get();
+  } else {
+    data_ptr = data_.get();

[Andrew MacDonald, 2015/07/29 03:52:27]

Initialize data_ptr to data_.get() when you declare it and you can skip this
else block.

[ekm, 2015/07/29 23:35:06]

Done.

+  }
+
+  if (frame->num_channels_ == num_channels_) {
+    Interleave(data_ptr->ibuf()->channels(), proc_num_frames_, num_channels_,
+               frame->data_);
+  } else {
+    UpmixMonoToInterleaved(data_ptr->ibuf()->channels()[0], proc_num_frames_,

[aluebs-webrtc, 2015/07/29 22:17:10]

Should this method be in a anonymous namespace in this file instead in
audio_util? Or even don't abstract this? Just to keep things together, since the
interleaved format is deprecated and will eventually disappear? I don't have a
strong opinion.

[ekm, 2015/07/29 23:35:06]

Hmm.... it seems cleaner and clearer as is for now, though I can't really weigh
in on the deprecation issue. Andrew?

[aluebs-webrtc, 2015/07/30 15:28:07]

As I said, I don't have a strong opinion and I agree it is cleaner. I was just
suggesting to avoid spreading this interface code. If you find it clearer, leave
it as is.

[ekm, 2015/07/30 21:23:50]

Acknowledged.

+                           frame->num_channels_, frame->data_);
+  }
 }
 
 void AudioBuffer::CopyLowPassToReference() {