Call GetDefaultOutputDeviceID() from GetDefaultOutputStreamParameters() instead of specifying an em…

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>
@@ skipping 347 matching lines @@
 
 std::string AudioManagerWin::GetDefaultOutputDeviceID() {
   if (!CoreAudioUtil::IsSupported())
     return std::string();
   return CoreAudioUtil::GetDefaultOutputDeviceID();
 }
 
 AudioParameters AudioManagerWin::GetPreferredOutputStreamParameters(
     const std::string& output_device_id,
     const AudioParameters& input_params) {
-  // TODO(tommi): Support |output_device_id|.
-  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
-
   const bool core_audio_supported = CoreAudioUtil::IsSupported();
   DLOG_IF(ERROR, !core_audio_supported && !output_device_id.empty())
       << "CoreAudio is required to open non-default devices.";
 
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
   int sample_rate = 48000;
   int buffer_size = kFallbackBufferSize;
   int bits_per_sample = 16;
   int input_channels = 0;
   bool use_input_params = !core_audio_supported;
   if (core_audio_supported) {
     if (cmd_line->HasSwitch(switches::kEnableExclusiveAudio)) {
       // TODO(rtoy): 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;
       if (input_params.IsValid())
         channel_layout = input_params.channel_layout();
     } else {
       AudioParameters params;
-      HRESULT hr = CoreAudioUtil::GetPreferredAudioParameters(output_device_id,
-                                                              &params);
+      HRESULT hr = CoreAudioUtil::GetPreferredAudioParameters(
+          output_device_id.empty() ?
+              GetDefaultOutputDeviceID() : output_device_id,
+          &params);
       if (SUCCEEDED(hr)) {
         bits_per_sample = params.bits_per_sample();
         buffer_size = params.frames_per_buffer();
         channel_layout = params.channel_layout();
         sample_rate = params.sample_rate();
       } else {
         use_input_params = true;
       }
     }
   }
@@ skipping 62 matching lines @@
   return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers,
                                        xp_device_id);
 }
 
 /// static
 AudioManager* CreateAudioManager() {
   return new AudioManagerWin();
 }
 
 }  // namespace media