Merge 150011 - Use 3 wave out buffers for all XP configurations (not just single-processor).

media/audio/audio_util.cc

Index: media/audio/audio_util.cc
===================================================================
--- media/audio/audio_util.cc	(revision 150011)
+++ media/audio/audio_util.cc	(working copy)
@@ -21,7 +21,6 @@
 #include "base/shared_memory.h"
 #include "base/time.h"
 #if defined(OS_WIN)
-#include "base/sys_info.h"
 #include "base/win/windows_version.h"
 #include "media/audio/audio_manager_base.h"
 #endif
@@ -521,20 +520,13 @@
 }
 
 int NumberOfWaveOutBuffers() {
-  // The entire Windows audio stack was rewritten for Windows Vista, and the
-  // wave out API is simulated on top of new API, so there is noticeable
-  // performance degradation compared to Windows XP. So use 4 buffers for Vista.
-  if (base::win::GetVersion() == base::win::VERSION_VISTA)
-    return 4;
-
-  // Part of regression was apparently fixed in Windows 7, but problems remain
-  // at least with some configurations (compared to XP). So use 3 buffers for
-  // Windows 7 and higher.
-  if (base::win::GetVersion() >= base::win::VERSION_WIN7)
-    return 3;
-
-  // Otherwise (for XP), use 3 buffers on single-core systems and 2 otherwise.
-  return (base::SysInfo::NumberOfProcessors() < 2) ? 3 : 2;
+  // Use 4 buffers for Vista, 3 for everyone else:
+  //  - The entire Windows audio stack was rewritten for Windows Vista and wave
+  //    out performance was degraded compared to XP.
+  //  - The regression was fixed in Windows 7 and most configurations will work
+  //    with 2, but some (e.g., some Sound Blasters) still need 3.
+  //  - Some XP configurations (even multi-processor ones) also need 3.
+  return (base::win::GetVersion() == base::win::VERSION_VISTA) ? 4 : 3;
 }
 
 #endif