Plumb |input_channels| all the way to AudioManager

media/audio/mac/audio_manager_mac.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/mac/audio_manager_mac.h"
 
 #include <CoreAudio/AudioHardware.h>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 265 matching lines @@
 AudioOutputStream* AudioManagerMac::MakeLinearOutputStream(
     const AudioParameters& params) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
   return new PCMQueueOutAudioOutputStream(this, params);
 }
 
 AudioOutputStream* AudioManagerMac::MakeLowLatencyOutputStream(
     const AudioParameters& params) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
 
-  // TODO(crogers): remove once we properly handle input device selection.
+  // TODO(crogers): support more than stereo input.
+  // TODO(crogers): remove flag once we handle input device selection.
   // https://code.google.com/p/chromium/issues/detail?id=147327
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableWebAudioInput)) {
+  if (params.input_channels() == 2 &&
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableWebAudioInput)) {
     if (HasUnifiedDefaultIO())
       return new AudioHardwareUnifiedStream(this, params);
 
     // kAudioDeviceUnknown translates to "use default" here.
     return new AudioSynchronizedStream(this,
                                        params,
                                        kAudioDeviceUnknown,
                                        kAudioDeviceUnknown);
   }
 
@@ skipping 21 matching lines @@
 
 AudioParameters AudioManagerMac::GetPreferredLowLatencyOutputStreamParameters(
     const AudioParameters& input_params) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableWebAudioInput)) {
     // TODO(crogers): given the limitations of the AudioOutputStream
     // back-ends used with kEnableWebAudioInput, we hard-code to stereo.
     // Specifically, this is a limitation of AudioSynchronizedStream which
     // can be removed as part of the work to consolidate these back-ends.
     return AudioParameters(
-        AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
+        AudioParameters::AUDIO_PCM_LOW_LATENCY,
+        CHANNEL_LAYOUT_STEREO, input_params.input_channels(),
         GetAudioHardwareSampleRate(), 16, GetAudioHardwareBufferSize());
   }
 
   return AudioManagerBase::GetPreferredLowLatencyOutputStreamParameters(
       input_params);
 }
 
 void AudioManagerMac::CreateDeviceListener() {
   DCHECK(GetMessageLoop()->BelongsToCurrentThread());
   output_device_listener_.reset(new AudioDeviceListenerMac(base::Bind(
@@ skipping 12 matching lines @@
   GetMessageLoop()->PostDelayedTask(FROM_HERE, base::Bind(
       &AudioManagerMac::NotifyAllOutputDeviceChangeListeners,
       base::Unretained(this)), base::TimeDelta::FromSeconds(2));
 }
 
 AudioManager* CreateAudioManager() {
   return new AudioManagerMac();
 }
 
 }  // namespace media