Moved AudioUtil static functions to AudioManager interfaces

media/audio/win/audio_manager_win.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/audio_io.h"
 
 #include <windows.h>
 #include <objbase.h>  // This has to be before initguid.h
 #include <initguid.h>
 #include <mmsystem.h>
 #include <setupapi.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
-#include "media/audio/audio_util.h"
+#include "media/audio/audio_parameters.h"
 #include "media/audio/win/audio_device_listener_win.h"
 #include "media/audio/win/audio_low_latency_input_win.h"
 #include "media/audio/win/audio_low_latency_output_win.h"
 #include "media/audio/win/audio_manager_win.h"
 #include "media/audio/win/audio_unified_win.h"
 #include "media/audio/win/core_audio_util_win.h"
 #include "media/audio/win/device_enumeration_win.h"
 #include "media/audio/win/wavein_input_win.h"
 #include "media/audio/win/waveout_output_win.h"
 #include "media/base/bind_to_loop.h"
+#include "media/base/channel_layout.h"
 #include "media/base/limits.h"
 #include "media/base/media_switches.h"
 
 // Libraries required for the SetupAPI and Wbem APIs used here.
 #pragma comment(lib, "setupapi.lib")
 
 // The following are defined in various DDK headers, and we (re)define them here
 // to avoid adding the DDK as a chrome dependency.
 #define DRV_QUERYDEVICEINTERFACE 0x80c
 #define DRVM_MAPPER_PREFERRED_GET 0x2015
@@ skipping 10 matching lines @@
 // right drivers, but graceful error handling is needed.
 static const int kWinMaxChannels = 8;
 
 // We use 3 buffers for recording audio so that if a recording callback takes
 // some time to return we won't lose audio. More buffers while recording are
 // ok because they don't introduce any delay in recording, unlike in playback
 // where you first need to fill in that number of buffers before starting to
 // play.
 static const int kNumInputBuffers = 3;
 
+// Buffer size to use for input and output stream when a proper size can't be
+// determined from the system
+static const int kFallbackBufferSize = 2048;
+
 static int GetVersionPartAsInt(DWORDLONG num) {
   return static_cast<int>(num & 0xffff);
 }
 
 // Returns a string containing the given device's description and installed
 // driver version.
 static string16 GetDeviceAndDriverInfo(HDEVINFO device_info,
                                        SP_DEVINFO_DATA* device_data) {
   // Save the old install params setting and set a flag for the
   // SetupDiBuildDriverInfoList below to return only the installed drivers.
@@ skipping 174 matching lines @@
 
   // Always add default device parameters as first element.
   if (!device_names->empty()) {
     media::AudioDeviceName name;
     name.device_name = AudioManagerBase::kDefaultDeviceName;
     name.unique_id = AudioManagerBase::kDefaultDeviceId;
     device_names->push_front(name);
   }
 }
 
+AudioParameters AudioManagerWin::GetDefaultOutputStreamParameters(
+    const AudioParameters& input_params) {
+  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
+  int sample_rate = 0;
+  int buffer_size = 0;
+  int bits_per_sample = 16;
+  int input_channels = 0;
+  if (!CoreAudioUtil::IsSupported()) {
+    // Fall back to Windows Wave implementation on Windows XP or lower.
+    if (input_params.IsValid()) {
+      // Use the client's input parameters if they are valid.
+      sample_rate = input_params.sample_rate();
+      bits_per_sample = input_params.bits_per_sample();
+      channel_layout = input_params.channel_layout();
+      input_channels = input_params.input_channels();
+      buffer_size = input_params.frames_per_buffer();
+    } else {
+      // Use 48kHz as default input sample rate, kFallbackBufferSize as
+      // default buffer size.
+      sample_rate = 48000;
+      buffer_size = kFallbackBufferSize;
+    }
+  } else if (cmd_line->HasSwitch(switches::kEnableExclusiveAudio)) {
+    // TODO(crogers): tune these values for best possible WebAudio performance.
+    // WebRTC works well at 48kHz and a buffer size of 480 samples will be used
+    // for this case. Note that exclusive mode is experimental.
+    // This sample rate will be combined with a buffer size of 256 samples,
+    // which corresponds to an output delay of ~5.33ms.
+    sample_rate = 48000;
+    buffer_size = 256;16

[Chris Rogers, 2013/03/04 01:04:11]

256;16 ??

[no longer working on chromium, 2013/03/04 14:55:04]

oh, a mistake. Removed now. thanks.

+  } else {
+    // Hardware sample-rate on Windows can be configured, so we must query.
+    // TODO(henrika): improve possibility to specify an audio endpoint.
+    // Use the default device (same as for Wave) for now to be compatible.
+    sample_rate = WASAPIAudioOutputStream::HardwareSampleRate();
+
+    AudioParameters params;
+    HRESULT hr = CoreAudioUtil::GetPreferredAudioParameters(eRender, eConsole,
+                                                            &params);
+    buffer_size = FAILED(hr) ? kFallbackBufferSize : params.frames_per_buffer();
+    channel_layout = WASAPIAudioOutputStream::HardwareChannelLayout();

[Chris Rogers, 2013/03/04 01:04:11]

you need to set |input_channels| here to what |input_params| says

[no longer working on chromium, 2013/03/04 14:55:04]

Fixed now.

+  }
+
+  return AudioParameters(
+      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels,
+      sample_rate, bits_per_sample, buffer_size);
+}
+
+AudioParameters AudioManagerWin::GetInputStreamParameters(
+    const std::string& device_id) {
+  int sample_rate = 0;
+  ChannelLayout channel_layout = CHANNEL_LAYOUT_NONE;
+  if (!CoreAudioUtil::IsSupported()) {
+    sample_rate = 48000;
+    channel_layout = CHANNEL_LAYOUT_STEREO;
+  } else {
+    sample_rate = WASAPIAudioInputStream::HardwareSampleRate(device_id);
+    channel_layout =
+        WASAPIAudioInputStream::HardwareChannelCount(device_id) == 1 ?
+            CHANNEL_LAYOUT_MONO : CHANNEL_LAYOUT_STEREO;
+  }
+
+  // TODO(Henrika): improve the default buffer size value for input stream.
+  return AudioParameters(
+      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
+      sample_rate, 16, kFallbackBufferSize);
+}
+
 // Factory for the implementations of AudioOutputStream for AUDIO_PCM_LINEAR
 // mode.
 // - PCMWaveOutAudioOutputStream: Based on the waveOut API.
 AudioOutputStream* AudioManagerWin::MakeLinearOutputStream(
     const AudioParameters& params) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
   if (params.channels() > kWinMaxChannels)
     return NULL;
 
   return new PCMWaveOutAudioOutputStream(this,
@@ skipping 77 matching lines @@
 
   return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers,
                                        xp_device_id);
 }
 
 /// static
 AudioManager* CreateAudioManager() {
   return new AudioManagerWin();
 }
 
-AudioParameters AudioManagerWin::GetPreferredLowLatencyOutputStreamParameters(
-    const AudioParameters& input_params) {
-  // If WASAPI isn't supported we'll fallback to WaveOut, which will take care
-  // of resampling and bits per sample changes.  By setting these equal to the
-  // input values, AudioOutputResampler will skip resampling and bit per sample
-  // differences (since the input parameters will match the output parameters).
-  int sample_rate = input_params.sample_rate();
-  int bits_per_sample = input_params.bits_per_sample();
-  ChannelLayout channel_layout = input_params.channel_layout();
-  int input_channels = input_params.input_channels();
-  if (CoreAudioUtil::IsSupported()) {
-    sample_rate = GetAudioHardwareSampleRate();
-    bits_per_sample = 16;
-    channel_layout = WASAPIAudioOutputStream::HardwareChannelLayout();
-  }
-
-  // TODO(dalecurtis): This should include hardware bits per channel eventually.
-  return AudioParameters(
-      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels,
-      sample_rate, bits_per_sample, GetAudioHardwareBufferSize());
-}
-
 }  // namespace media