Call GetDefaultOutputDeviceID() from GetDefaultOutputStreamParameters()...

Call GetDefaultOutputDeviceID() from GetDefaultOutputStreamParameters() instead of specifying an empty string.

BUG=285437
R=henrika@chromium.org

Review URL: https://codereview.chromium.org/23440020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221429 0039d316-1c4b-4281-b951-d872f2087c98

media/audio/audio_manager_base.cc

@@ -400,7 +400,8 @@ void AudioManagerBase::NotifyAllOutputDeviceChangeListeners() {
 }
 
 AudioParameters AudioManagerBase::GetDefaultOutputStreamParameters() {
-  return GetPreferredOutputStreamParameters("", AudioParameters());
+  return GetPreferredOutputStreamParameters(GetDefaultOutputDeviceID(),
+      AudioParameters());
 }
 
 AudioParameters AudioManagerBase::GetOutputStreamParameters(

media/audio/win/audio_manager_win.cc

@@ -365,9 +365,6 @@ std::string AudioManagerWin::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.";
@@ -392,8 +389,10 @@ AudioParameters AudioManagerWin::GetPreferredOutputStreamParameters(
         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();