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

Unified Diff: media/base/media.h

Issue 1161183003: Revert "Chromium changes to statically link ffmpeg." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « media/base/BUILD.gn ('k') | media/base/media.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media.h
diff --git a/media/base/media.h b/media/base/media.h
index 01a913bc45ff956702377f097a036015951821f0..c86e5683faccc87e5e3f133530efe35f9538e4db 100644
--- a/media/base/media.h
+++ b/media/base/media.h
@@ -16,9 +16,32 @@ class FilePath;
namespace media {
-// Initializes media libraries (e.g. ffmpeg) as well as CPU specific media
-// features.
-MEDIA_EXPORT void InitializeMediaLibrary();
+// Attempts to initialize the media library (loading DLLs, DSOs, etc.).
+//
+// If |module_dir| is the empty string, then the system default library paths
+// are searched for the dynamic libraries. If a |module_dir| is provided, then
+// only the specified |module_dir| will be searched for the dynamic libraries.
+//
+// If multiple initializations are attempted with different |module_dir|s
+// specified then the first one to succeed remains effective for the lifetime
+// of the process.
+//
+// Returns true if everything was successfully initialized, false otherwise.
+MEDIA_EXPORT bool InitializeMediaLibrary(const base::FilePath& module_dir);
+
+// Helper function for unit tests to avoid boiler plate code everywhere. This
+// function will crash if it fails to load the media library. This ensures tests
+// fail if the media library is not available.
+MEDIA_EXPORT void InitializeMediaLibraryForTesting();
+
+// Use this if you need to check whether the media library is initialized
+// for the this process, without actually trying to initialize it.
+MEDIA_EXPORT bool IsMediaLibraryInitialized();
+
+// Use this if you need to initialize CPU specific features WITHOUT loading
+// DLLs, DSOs, etc. Only necessary if InitializeMediaLibrary() is not called;
+// does nothing if the media library has already been initialized.
+MEDIA_EXPORT void InitializeCPUSpecificMediaFeatures();
} // namespace media
« no previous file with comments | « media/base/BUILD.gn ('k') | media/base/media.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698