OLD | NEW |
---|---|
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 "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/synchronization/lock.h" | 10 #include "base/synchronization/lock.h" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "media/base/yuv_convert.h" | 12 #include "media/base/yuv_convert.h" |
13 | 13 |
14 #if !defined(MEDIA_DISABLE_FFMPEG) | |
15 #include "media/ffmpeg/ffmpeg_common.h" | |
16 #endif | |
17 | |
14 namespace media { | 18 namespace media { |
15 | 19 |
16 namespace internal { | |
17 // Platform specific initialization method. | |
18 extern bool InitializeMediaLibraryInternal(const base::FilePath& module_dir); | |
19 } // namespace internal | |
20 | |
21 // Media must only be initialized once, so use a LazyInstance to ensure this. | 20 // Media must only be initialized once, so use a LazyInstance to ensure this. |
22 class MediaInitializer { | 21 class MediaInitializer { |
23 public: | 22 public: |
24 bool Initialize(const base::FilePath& module_dir) { | 23 void Initialize() { |
DaleCurtis
2015/06/02 18:21:07
No need for an Initilize() method and a lock anymo
chcunningham
2015/06/03 01:14:16
Done.
| |
25 base::AutoLock auto_lock(lock_); | 24 base::AutoLock auto_lock(lock_); |
26 if (!tried_initialize_) { | 25 if (!initialized_) { |
27 tried_initialize_ = true; | 26 #if !defined(MEDIA_DISABLE_FFMPEG) |
28 initialized_ = internal::InitializeMediaLibraryInternal(module_dir); | 27 // Disable logging as it interferes with layout tests. |
DaleCurtis
2015/06/02 18:21:07
Indent is wrong for these, it should be as if the
chcunningham
2015/06/03 01:14:16
Done.
| |
28 av_log_set_level(AV_LOG_QUIET); | |
29 | |
30 #if defined(ALLOCATOR_SHIM) | |
31 // Remove allocation limit from ffmpeg, so calls go down to shim layer. | |
32 av_max_alloc(0); | |
33 #endif // defined(ALLOCATOR_SHIM) | |
34 | |
35 #endif // !defined(MEDIA_DISABLE_FFMPEG) | |
36 | |
37 initialized_ = true; | |
29 } | 38 } |
30 return initialized_; | |
31 } | |
32 | |
33 bool IsInitialized() { | |
34 base::AutoLock auto_lock(lock_); | |
35 return initialized_; | |
36 } | 39 } |
37 | 40 |
38 private: | 41 private: |
39 friend struct base::DefaultLazyInstanceTraits<MediaInitializer>; | 42 friend struct base::DefaultLazyInstanceTraits<MediaInitializer>; |
40 | 43 |
41 MediaInitializer() | 44 MediaInitializer() : initialized_(false) { |
42 : initialized_(false), | |
43 tried_initialize_(false) { | |
44 // Perform initialization of libraries which require runtime CPU detection. | 45 // Perform initialization of libraries which require runtime CPU detection. |
45 InitializeCPUSpecificYUVConversions(); | 46 InitializeCPUSpecificYUVConversions(); |
46 } | 47 } |
47 | 48 |
48 ~MediaInitializer() { | 49 ~MediaInitializer() { |
49 NOTREACHED() << "MediaInitializer should be leaky!"; | 50 NOTREACHED() << "MediaInitializer should be leaky!"; |
50 } | 51 } |
51 | 52 |
52 base::Lock lock_; | 53 base::Lock lock_; |
53 bool initialized_; | 54 bool initialized_; |
54 bool tried_initialize_; | |
55 | 55 |
56 DISALLOW_COPY_AND_ASSIGN(MediaInitializer); | 56 DISALLOW_COPY_AND_ASSIGN(MediaInitializer); |
57 }; | 57 }; |
58 | 58 |
59 static base::LazyInstance<MediaInitializer>::Leaky g_media_library = | 59 static base::LazyInstance<MediaInitializer>::Leaky g_media_library = |
60 LAZY_INSTANCE_INITIALIZER; | 60 LAZY_INSTANCE_INITIALIZER; |
61 | 61 |
62 bool InitializeMediaLibrary(const base::FilePath& module_dir) { | 62 void InitializeMediaLibrary() { |
63 return g_media_library.Get().Initialize(module_dir); | 63 g_media_library.Get().Initialize(); |
64 } | |
65 | |
66 void InitializeMediaLibraryForTesting() { | |
67 base::FilePath module_dir; | |
68 CHECK(PathService::Get(base::DIR_EXE, &module_dir)); | |
69 CHECK(g_media_library.Get().Initialize(module_dir)); | |
70 } | |
71 | |
72 bool IsMediaLibraryInitialized() { | |
73 return g_media_library.Get().IsInitialized(); | |
74 } | 64 } |
75 | 65 |
76 void InitializeCPUSpecificMediaFeatures() { | 66 void InitializeCPUSpecificMediaFeatures() { |
77 // Force initialization of the media initializer, but don't call Initialize(). | 67 // Force initialization of the media initializer, but don't call Initialize(). |
78 g_media_library.Get(); | 68 g_media_library.Get(); |
79 } | 69 } |
80 | 70 |
81 } // namespace media | 71 } // namespace media |
OLD | NEW |