diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 21:21:03 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 21:21:03 +0000 |
| commit | 16127bcad237da97b83867f75517f46f836b1a7f (patch) | |
| tree | 52cf4d1d44bfb93b725afeb515184d701e74a673 /content | |
| parent | 8f09b240059e2b6834026740b41e8c689d23e30e (diff) | |
| download | chromium_src-16127bcad237da97b83867f75517f46f836b1a7f.zip chromium_src-16127bcad237da97b83867f75517f46f836b1a7f.tar.gz chromium_src-16127bcad237da97b83867f75517f46f836b1a7f.tar.bz2 | |
Revert 149508 - Always use non-low-latency (wave out) audio for Pepper plugins on Windows.
[Because the non-low-latency path is so awful, especially on Vista.]
(In particular, for Pepper Flash.)
The intent is to try this out on Canary for M21, merge it to M21 if it looks
good, and then revert this change.
BUG=139953
TBR=cpu,brettw
Review URL: https://chromiumcodereview.appspot.com/10828124
TBR=viettrungluu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10823148
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/pepper/pepper_platform_audio_output_impl.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.cc b/content/renderer/pepper/pepper_platform_audio_output_impl.cc index ac99a6a..5f1f57d 100644 --- a/content/renderer/pepper/pepper_platform_audio_output_impl.cc +++ b/content/renderer/pepper/pepper_platform_audio_output_impl.cc @@ -120,14 +120,6 @@ bool PepperPlatformAudioOutputImpl::Initialize( client_ = client; media::AudioParameters::Format format; -#if defined(OS_WIN) - // For Chrome 21 on Windows, avoid the low-latency (WASAPI) path for the sake - // of Pepper Flash. Currently, the WASAPI path will fail silently for, e.g., - // 5.1/7.1 sound. (Flash always requests 44.1 kHz anyways, so it's already - // using the non-low-latency (wave-out) path on any system that's configured - // for 48 kHz.) - format = media::AudioParameters::AUDIO_PCM_LINEAR; -#else const int kMaxFramesForLowLatency = 2400; // Use the low latency back end if the client request is compatible, and // the sample count is low enough to justify using AUDIO_PCM_LOW_LATENCY. @@ -138,7 +130,6 @@ bool PepperPlatformAudioOutputImpl::Initialize( } else { format = media::AudioParameters::AUDIO_PCM_LINEAR; } -#endif media::AudioParameters params(format, CHANNEL_LAYOUT_STEREO, sample_rate, 16, frames_per_buffer); |