Index: media/audio/audio_util.cc |
diff --git a/media/audio/audio_util.cc b/media/audio/audio_util.cc |
index b387ce71ed8175a402d5e4f7251bdc1d8df55882..554567e0bdec7e46d8cfb17669c1a997d7813cc3 100644 |
--- a/media/audio/audio_util.cc |
+++ b/media/audio/audio_util.cc |
@@ -309,21 +309,21 @@ size_t GetAudioHardwareBufferSize() { |
#endif |
} |
-uint32 GetAudioInputHardwareChannelCount(const std::string& device_id) { |
+ChannelLayout GetAudioInputHardwareChannelLayout(const std::string& device_id) { |
// TODO(henrika): add support for device selection on all platforms. |
// Only exists on Windows today. |
- enum channel_layout { MONO = 1, STEREO = 2 }; |
#if defined(OS_MACOSX) |
- return MONO; |
+ return CHANNEL_LAYOUT_MONO; |
#elif defined(OS_WIN) |
if (!IsWASAPISupported()) { |
// Fall back to Windows Wave implementation on Windows XP or lower and |
// use stereo by default. |
- return STEREO; |
+ return CHANNEL_LAYOUT_STEREO; |
} |
- return WASAPIAudioInputStream::HardwareChannelCount(device_id); |
+ return WASAPIAudioInputStream::HardwareChannelCount(device_id) == 1 ? |
+ CHANNEL_LAYOUT_MONO : CHANNEL_LAYOUT_STEREO; |
#else |
- return STEREO; |
+ return CHANNEL_LAYOUT_STEREO; |
#endif |
} |