diff options
| author | henrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 10:09:33 +0000 |
|---|---|---|
| committer | henrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 10:09:33 +0000 |
| commit | 5f02d1749459f4a99d0818c888dc6b0fb780ef05 (patch) | |
| tree | 9ba608a0bed1c864b3b8aeedb8529aadd479608e /media/audio/audio_util.cc | |
| parent | cbab9b3530e7be88f438f454b85e1d9576ddefd9 (diff) | |
| download | chromium_src-5f02d1749459f4a99d0818c888dc6b0fb780ef05.zip chromium_src-5f02d1749459f4a99d0818c888dc6b0fb780ef05.tar.gz chromium_src-5f02d1749459f4a99d0818c888dc6b0fb780ef05.tar.bz2 | |
Port Unified audio class on Windows using the new Core Audio utility
BUG=none
TEST=media_unittests.exe --gtest_filter=CoreAudio*
TEST= out/Debug/media_unittests.exe --gtest_filter=WASAPIUni* --enable-webaudio-input
Manual tests of enable/disable of audio output devices.
Tested http://webaudiodemos.appspot.com/input/index.html in Chrome using the --enable-webaudio-input flag.
Review URL: https://codereview.chromium.org/11340014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_util.cc')
| -rw-r--r-- | media/audio/audio_util.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/media/audio/audio_util.cc b/media/audio/audio_util.cc index 8f05410..ac43b70 100644 --- a/media/audio/audio_util.cc +++ b/media/audio/audio_util.cc @@ -32,7 +32,7 @@ #include "media/audio/audio_manager_base.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_unified_win.h" +#include "media/audio/win/core_audio_util_win.h" #include "media/base/limits.h" #include "media/base/media_switches.h" #endif @@ -252,13 +252,13 @@ size_t GetAudioHardwareBufferSize() { return 256; } - // TODO(henrika): remove when HardwareBufferSize() has been tested well - // enough to be moved from WASAPIUnifiedStream to WASAPIAudioOutputStream. + // TODO(henrika): remove when the --enable-webaudio-input flag is no longer + // utilized. if (cmd_line->HasSwitch(switches::kEnableWebAudioInput)) { - int buffer_size = WASAPIUnifiedStream::HardwareBufferSize(eRender); - // |buffer_size| can be zero if we use e.g. remote desktop or if all - // audio devices are disabled. - return (buffer_size > 0) ? buffer_size : kFallbackBufferSize; + AudioParameters params; + HRESULT hr = CoreAudioUtil::GetPreferredAudioParameters(eRender, eConsole, + ¶ms); + return FAILED(hr) ? kFallbackBufferSize : params.frames_per_buffer(); } // This call must be done on a COM thread configured as MTA. |