Support 4 channel mic in Windows Core Audio

webrtc/voice_engine/utility.cc

 /*
  *  Copyright (c) 2012 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 23 matching lines @@
 }
 
 void RemixAndResample(const int16_t* src_data,
                       size_t samples_per_channel,
                       size_t num_channels,
                       int sample_rate_hz,
                       PushResampler<int16_t>* resampler,
                       AudioFrame* dst_frame) {
   const int16_t* audio_ptr = src_data;
   size_t audio_ptr_num_channels = num_channels;
-  int16_t mono_audio[AudioFrame::kMaxDataSizeSamples];
+  int16_t downsampled_audio[AudioFrame::kMaxDataSizeSamples];
 
   // Downmix before resampling.
-  if (num_channels == 2 && dst_frame->num_channels_ == 1) {
-    AudioFrameOperations::StereoToMono(src_data, samples_per_channel,
-                                       mono_audio);
-    audio_ptr = mono_audio;
-    audio_ptr_num_channels = 1;
+  if (num_channels > dst_frame->num_channels_) {
+    AudioFrameOperations::DownmixChannels(

[jens.nielsen, 2017/02/23 16:29:18]

Maybe needs some error handling here for unsupported channels combinations but
the old code also makes assumptions, and "Never fix more than one bug in each
CL"

[hlundin-webrtc, 2017/02/24 09:46:36]

I think this leaves the field a little too open. I suggest you add some DCHECKs
here.
RTC_DCHECK(num_channels == 2 || num_channels == 4) << "num_channels: " <<
num_channels;
RTC_DCHECK(dst_frame->num_channels_ == 1 || dst_frame->num_channels_ == 2) <<
"dst_frame->num_channels_: " << dst_frame->num_channels_;

[jens.nielsen, 2017/02/24 14:55:49]

Done.

+        src_data, num_channels, samples_per_channel,downsampled_audio,
+        dst_frame->num_channels_);
+    audio_ptr = downsampled_audio;
+    audio_ptr_num_channels = dst_frame->num_channels_;
   }
 
   if (resampler->InitializeIfNeeded(sample_rate_hz, dst_frame->sample_rate_hz_,
                                     audio_ptr_num_channels) == -1) {
     FATAL() << "InitializeIfNeeded failed: sample_rate_hz = " << sample_rate_hz
             << ", dst_frame->sample_rate_hz_ = " << dst_frame->sample_rate_hz_
             << ", audio_ptr_num_channels = " << audio_ptr_num_channels;
   }
 
   const size_t src_length = samples_per_channel * audio_ptr_num_channels;
@@ skipping 46 matching lines @@
     int32_t temp = 0;
     for (size_t i = 0; i < source_len; ++i) {
       temp = source[i] + target[i];
       target[i] = WebRtcSpl_SatW32ToW16(temp);
     }
   }
 }
 
 }  // namespace voe
 }  // namespace webrtc