Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(919)

Side by Side Diff: media/base/media_android.cc

Issue 14891002: Remove function level static initializers media library initialization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/base/media.cc ('k') | media/base/media_posix.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/media.h" 5 #include "media/base/media.h"
6 6
7 #include <cpu-features.h> 7 #include <cpu-features.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h"
11 #include "media/base/android/media_jni_registrar.h"
12 10
13 namespace media { 11 namespace media {
12 namespace internal {
14 13
15 // Caches the result of the check for NEON support. 14 bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
16 static bool g_media_library_is_initialized = false;
17
18 bool InitializeMediaLibrary(const base::FilePath& module_dir) {
19 // No real initialization is necessary but we do need to check if 15 // No real initialization is necessary but we do need to check if
20 // Neon is supported because the FFT library requires Neon. 16 // Neon is supported because the FFT library requires Neon.
21 g_media_library_is_initialized = (android_getCpuFeatures() & 17 return (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
22 ANDROID_CPU_ARM_FEATURE_NEON) != 0;
23 return g_media_library_is_initialized;
24 } 18 }
25 19
26 void InitializeMediaLibraryForTesting() { 20 } // namespace internal
27 // Register JNI bindings for android.
28 JNIEnv* env = base::android::AttachCurrentThread();
29 RegisterJni(env);
30 }
31
32 bool IsMediaLibraryInitialized() {
33 return g_media_library_is_initialized;
34 }
35
36 } // namespace media 21 } // namespace media
OLDNEW
« no previous file with comments | « media/base/media.cc ('k') | media/base/media_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698