Support 4 channel mic in Windows Core Audio

webrtc/modules/audio_device/win/audio_device_core_win.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 506 matching lines @@
     _hCaptureStartedEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
     _hSetCaptureVolumeEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
 
     _perfCounterFreq.QuadPart = 1;
     _perfCounterFactor = 0.0;
     _avgCPULoad = 0.0;
 
     // list of number of channels to use on recording side
     _recChannelsPrioList[0] = 2;    // stereo is prio 1
     _recChannelsPrioList[1] = 1;    // mono is prio 2
+    _recChannelsPrioList[2] = 4;    // quad is prio 3
 
     // list of number of channels to use on playout side
     _playChannelsPrioList[0] = 2;    // stereo is prio 1
     _playChannelsPrioList[1] = 1;    // mono is prio 2
 
     HRESULT hr;
 
     // We know that this API will work since it has already been verified in
     // CoreAudioIsSupported, hence no need to check for errors here as well.
 
@@ skipping 1987 matching lines @@
     }
 
     if (_builtInAecEnabled)
     {
         // The DMO will configure the capture device.
         return InitRecordingDMO();
     }
 
     HRESULT hr = S_OK;
     WAVEFORMATEX* pWfxIn = NULL;
-    WAVEFORMATEX Wfx = WAVEFORMATEX();
+    WAVEFORMATEXTENSIBLE Wfx = WAVEFORMATEXTENSIBLE();
     WAVEFORMATEX* pWfxClosestMatch = NULL;
 
     // Create COM object with IAudioClient interface.
     SAFE_RELEASE(_ptrClientIn);
     hr = _ptrDeviceIn->Activate(
                           __uuidof(IAudioClient),
                           CLSCTX_ALL,
                           NULL,
                           (void**)&_ptrClientIn);
     EXIT_ON_ERROR(hr);
@@ skipping 13 matching lines @@
         // for buffer estimation
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nAvgBytesPerSec: %d", pWfxIn->nAvgBytesPerSec);
         // block size of data
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nBlockAlign    : %d", pWfxIn->nBlockAlign);
         // number of bits per sample of mono data
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "wBitsPerSample : %d", pWfxIn->wBitsPerSample);
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "cbSize         : %d", pWfxIn->cbSize);
     }
 
     // Set wave format
-    Wfx.wFormatTag = WAVE_FORMAT_PCM;
-    Wfx.wBitsPerSample = 16;
-    Wfx.cbSize = 0;
+    Wfx.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+    Wfx.Format.wBitsPerSample = 16;
+    Wfx.Format.cbSize = 22;
+    Wfx.dwChannelMask = 0;
+    Wfx.Samples.wValidBitsPerSample = Wfx.Format.wBitsPerSample;
+    Wfx.SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
 
     const int freqs[6] = {48000, 44100, 16000, 96000, 32000, 8000};
     hr = S_FALSE;
 
     // Iterate over frequencies and channels, in order of priority
     for (unsigned int freq = 0; freq < sizeof(freqs)/sizeof(freqs[0]); freq++)
     {
         for (unsigned int chan = 0; chan < sizeof(_recChannelsPrioList)/sizeof(_recChannelsPrioList[0]); chan++)
         {
-            Wfx.nChannels = _recChannelsPrioList[chan];
-            Wfx.nSamplesPerSec = freqs[freq];
-            Wfx.nBlockAlign = Wfx.nChannels * Wfx.wBitsPerSample / 8;
-            Wfx.nAvgBytesPerSec = Wfx.nSamplesPerSec * Wfx.nBlockAlign;
+            Wfx.Format.nChannels = _recChannelsPrioList[chan];
+            Wfx.Format.nSamplesPerSec = freqs[freq];
+            Wfx.Format.nBlockAlign = Wfx.Format.nChannels *
+                                     Wfx.Format.wBitsPerSample / 8;
+            Wfx.Format.nAvgBytesPerSec = Wfx.Format.nSamplesPerSec *
+                                         Wfx.Format.nBlockAlign;
             // If the method succeeds and the audio endpoint device supports the specified stream format,
             // it returns S_OK. If the method succeeds and provides a closest match to the specified format,
             // it returns S_FALSE.
             hr = _ptrClientIn->IsFormatSupported(
                                   AUDCLNT_SHAREMODE_SHARED,
-                                  &Wfx,
+                                  (WAVEFORMATEX*)&Wfx,
                                   &pWfxClosestMatch);
             if (hr == S_OK)
             {
                 break;
             }
             else
             {
                 WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nChannels=%d, nSamplesPerSec=%d is not supported",
-                    Wfx.nChannels, Wfx.nSamplesPerSec);
+                    Wfx.Format.nChannels, Wfx.Format.nSamplesPerSec);
             }
         }
         if (hr == S_OK)
             break;
     }
 
     if (hr == S_OK)
     {
-        _recAudioFrameSize = Wfx.nBlockAlign;
-        _recSampleRate = Wfx.nSamplesPerSec;
-        _recBlockSize = Wfx.nSamplesPerSec/100;
-        _recChannels = Wfx.nChannels;
+        _recAudioFrameSize = Wfx.Format.nBlockAlign;
+        _recSampleRate = Wfx.Format.nSamplesPerSec;
+        _recBlockSize = Wfx.Format.nSamplesPerSec/100;
+        _recChannels = Wfx.Format.nChannels;
 
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "VoE selected this capturing format:");
-        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "wFormatTag        : 0x%X (%u)", Wfx.wFormatTag, Wfx.wFormatTag);
-        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nChannels         : %d", Wfx.nChannels);
-        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nSamplesPerSec    : %d", Wfx.nSamplesPerSec);
-        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nAvgBytesPerSec   : %d", Wfx.nAvgBytesPerSec);
-        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nBlockAlign       : %d", Wfx.nBlockAlign);
-        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "wBitsPerSample    : %d", Wfx.wBitsPerSample);
-        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "cbSize            : %d", Wfx.cbSize);
+        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "wFormatTag        : 0x%X (%u)", Wfx.Format.wFormatTag,
+                                                                                          Wfx.Format.wFormatTag);
+        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nChannels         : %d", Wfx.Format.nChannels);
+        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nSamplesPerSec    : %d", Wfx.Format.nSamplesPerSec);
+        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nAvgBytesPerSec   : %d", Wfx.Format.nAvgBytesPerSec);
+        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nBlockAlign       : %d", Wfx.Format.nBlockAlign);
+        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "wBitsPerSample    : %d", Wfx.Format.wBitsPerSample);
+        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "cbSize            : %d", Wfx.Format.cbSize);
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "Additional settings:");
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "_recAudioFrameSize: %d", _recAudioFrameSize);
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "_recBlockSize     : %d", _recBlockSize);
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "_recChannels      : %d", _recChannels);
     }
 
     // Create a capturing stream.
     hr = _ptrClientIn->Initialize(
                           AUDCLNT_SHAREMODE_SHARED,             // share Audio Engine with other applications
                           AUDCLNT_STREAMFLAGS_EVENTCALLBACK |   // processing of the audio buffer by the client will be event driven
                           AUDCLNT_STREAMFLAGS_NOPERSIST,        // volume and mute settings for an audio session will not persist across system restarts
                           0,                                    // required for event-driven shared mode
                           0,                                    // periodicity
-                          &Wfx,                                 // selected wave format
+                          (WAVEFORMATEX*)&Wfx,                  // selected wave format
                           NULL);                                // session GUID
 
 
     if (hr != S_OK)
     {
         WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, "IAudioClient::Initialize() failed:");
         if (pWfxClosestMatch != NULL)
         {
             WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, "closest mix format: #channels=%d, samples/sec=%d, bits/sample=%d",
                 pWfxClosestMatch->nChannels, pWfxClosestMatch->nSamplesPerSec, pWfxClosestMatch->wBitsPerSample);
@@ skipping 2447 matching lines @@
   int key_down = 0;
   for (int key = VK_SPACE; key < VK_NUMLOCK; key++) {
     short res = GetAsyncKeyState(key);
     key_down |= res & 0x1; // Get the LSB
   }
   return (key_down > 0);
 }
 }  // namespace webrtc
 
 #endif  // WEBRTC_WINDOWS_CORE_AUDIO_BUILD