Index: media/audio/win/audio_manager_win.cc |
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc |
index 02a04da780b89c7d181db9dd744795177fe6a781..6876b8682279e56f6ecd382f9b9d6a44a3565c16 100644 |
--- a/media/audio/win/audio_manager_win.cc |
+++ b/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, |
- ¶ms); |
+ HRESULT hr = CoreAudioUtil::GetPreferredAudioParameters( |
+ output_device_id.empty() ? |
+ GetDefaultOutputDeviceID() : output_device_id, |
+ ¶ms); |
if (SUCCEEDED(hr)) { |
bits_per_sample = params.bits_per_sample(); |
buffer_size = params.frames_per_buffer(); |