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

Unified Diff: media/base/win/mf_initializer.cc

Issue 2668813002: Remove LazyInstance usage from media/ (Closed)
Patch Set: Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: media/base/win/mf_initializer.cc
diff --git a/media/base/win/mf_initializer.cc b/media/base/win/mf_initializer.cc
index ff62a451e92c79943ecb24d35646e3985e2b6c2b..b1375b045cfe3b082fb999ea6a99a25b4b8ca405 100644
--- a/media/base/win/mf_initializer.cc
+++ b/media/base/win/mf_initializer.cc
@@ -6,36 +6,10 @@
#include <mfapi.h>
-#include "base/lazy_instance.h"
-#include "base/macros.h"
-
namespace media {
-namespace {
-
-// LazyInstance to initialize the Media Foundation Library.
-class MFInitializer {
- public:
- MFInitializer()
- : mf_started_(MFStartup(MF_VERSION, MFSTARTUP_LITE) == S_OK) {}
-
- ~MFInitializer() {
- if (mf_started_)
- MFShutdown();
- }
-
- private:
- const bool mf_started_;
-
- DISALLOW_COPY_AND_ASSIGN(MFInitializer);
-};
-
-base::LazyInstance<MFInitializer> g_mf_initializer = LAZY_INSTANCE_INITIALIZER;
-
-} // namespace
-
void InitializeMediaFoundation() {
- g_mf_initializer.Get();
+ static bool mf_started = MFStartup(MF_VERSION, MFSTARTUP_LITE) == S_OK;
scottmg 2017/01/31 21:10:34 Probably going to be a warning here on some compil
DaleCurtis 2017/01/31 22:04:33 Ah, win_clang complains about unused variable. Add
}
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698