summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrtoy@google.com <rtoy@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-28 20:17:59 +0000
committerrtoy@google.com <rtoy@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-28 20:17:59 +0000
commit896862e30005f027336f8270f005a55f768dd418 (patch)
tree42adff653eacd4812936e3b2ce275add6cb04971
parentdc403c40fa966d08c4c680cbc96205154b6accef (diff)
downloadchromium_src-896862e30005f027336f8270f005a55f768dd418.zip
chromium_src-896862e30005f027336f8270f005a55f768dd418.tar.gz
chromium_src-896862e30005f027336f8270f005a55f768dd418.tar.bz2
Merge 219944 "WebAudio should only be enabled on JellyBean or la..."
> WebAudio should only be enabled on JellyBean or later. > > BUG=259048 > > Review URL: https://chromiumcodereview.appspot.com/23600006 TBR=rtoy@google.com Review URL: https://codereview.chromium.org/23694003 git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@220079 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/child/runtime_features.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
index 79189ee..59073c2 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -26,7 +26,10 @@ static void SetRuntimeFeatureDefaultsForPlatform() {
#if defined(OS_ANDROID)
bool enable_webaudio = false;
#if defined(ARCH_CPU_ARMEL)
+ // WebAudio needs Android MediaCodec API that was introduced in
+ // JellyBean, and also currently needs NEON support for the FFT.
enable_webaudio =
+ (base::android::BuildInfo::GetInstance()->sdk_int() >= 16) &&
((android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0);
#endif
WebRuntimeFeatures::enableWebAudio(enable_webaudio);