diff options
| -rw-r--r-- | build/features_override.gypi | 11 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 8 |
2 files changed, 17 insertions, 2 deletions
diff --git a/build/features_override.gypi b/build/features_override.gypi index 6660caf..d1f547e 100644 --- a/build/features_override.gypi +++ b/build/features_override.gypi @@ -101,11 +101,20 @@ ], 'use_threaded_compositing': 1, }], - ['OS=="mac"', { + # TODO(crogers): For the moment Windows is only enabled for + # Google-branded build, since the FFmpeg DLLs need to be re-built + # for chromium. + ['OS=="mac" or OS=="linux" or (OS=="win" and branding=="Chrome")', { 'feature_defines': [ 'ENABLE_WEB_AUDIO=1', ], }], + # Mac OS X uses Accelerate.framework FFT by default instead of FFmpeg. + ['OS!="mac"', { + 'feature_defines': [ + 'WTF_USE_WEBAUDIO_FFMPEG=1', + ], + }], ], # TODO: If the need arises, create a mechanism that will intelligently # merge the lists rather than replace one with the other. This may diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index b9e3da3..add9d6d 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -217,7 +217,13 @@ const Experiment kExperiments[] = { "webaudio", IDS_FLAGS_WEBAUDIO_NAME, IDS_FLAGS_WEBAUDIO_DESCRIPTION, - kOsMac, // TODO(crogers): add windows and linux when FFT is ready. +// This switch is currently not available in CrOS. +// TODO(crogers): FFmpeg Windows DLLs need to be rebuilt for chromium. +#if defined(GOOGLE_CHROME_BUILD) + kOsMac | kOsWin | kOsLinux, +#else + kOsMac | kOsLinux, +#endif SINGLE_VALUE_TYPE(switches::kEnableWebAudio) }, { |