diff options
author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 02:34:25 +0000 |
---|---|---|
committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 02:34:25 +0000 |
commit | d87d5bec0033f1fb54b231d942a814010dacbfdc (patch) | |
tree | ad5d62225d84cb70d8c3bcb9ec47e2ef99a3a398 | |
parent | df3e31f605d7ec039ace6d96abaefa5972eb7e16 (diff) | |
download | chromium_src-d87d5bec0033f1fb54b231d942a814010dacbfdc.zip chromium_src-d87d5bec0033f1fb54b231d942a814010dacbfdc.tar.gz chromium_src-d87d5bec0033f1fb54b231d942a814010dacbfdc.tar.bz2 |
Merge 149119 to 1180_57 - Change NumberOfWaveOutBuffers() to return 3 for Windows >= Vista (instead of ==).
BUG=136624
TEST=See bug (SB Audigy SE configured at 48 kHz (default) on Win7 + Flapper).
Review URL: https://chromiumcodereview.appspot.com/10821100
TBR=viettrungluu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10836023
git-svn-id: svn://svn.chromium.org/chrome/branches/1180_57/src@149123 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | media/audio/audio_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/audio/audio_util.cc b/media/audio/audio_util.cc index 4035d28..6729db7 100644 --- a/media/audio/audio_util.cc +++ b/media/audio/audio_util.cc @@ -525,10 +525,10 @@ int NumberOfWaveOutBuffers() { // 2 otherwise. // Entire Windows audio stack was rewritten for Windows Vista, and wave out // API is simulated on top of new API, so there is noticeable performance - // degradation compared to Windows XP. Part of regression was fixed in - // Windows 7. Maybe it is fixed in Vista Serice Pack, but let's be cautious. + // degradation compared to Windows XP. Part of regression was apparently fixed + // in Windows 7, but problems remain at least with some configurations. if ((base::SysInfo::NumberOfProcessors() < 2) || - (base::win::GetVersion() == base::win::VERSION_VISTA)) { + (base::win::GetVersion() >= base::win::VERSION_VISTA)) { return 3; } return 2; |