Move media library path resolution into Chrome path provider.

media/base/media_posix.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/media.h"
 
 #include <string>
 
 #include <dlfcn.h>
 
@@ skipping 48 matching lines @@
     case tp_ffmpeg::kModuleAvformat52:
       return FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION));
     case tp_ffmpeg::kModuleAvutil50:
       return FILE_PATH_LITERAL(DSO_NAME("avutil", AVUTIL_VERSION));
     default:
       LOG(DFATAL) << "Invalid stub module requested: " << stub_key;
       return FILE_PATH_LITERAL("");
   }
 }
 
+static bool g_media_library_is_initialized = false;

[awong, 2011/02/25 02:41:59]

If it's in an anonymous namespace, don't bother with static.

Pick one or the other. :)

+
 }  // namespace
 
 // Attempts to initialize the media library (loading DSOs, etc.).
 // Returns true if everything was successfully initialized, false otherwise.
-bool InitializeMediaLibrary(const FilePath& module_dir) {
+void InitializeMediaLibrary(const FilePath& module_dir) {
+  if (g_media_library_is_initialized)
+    return;
+
   // TODO(ajwong): We need error resolution.
   tp_ffmpeg::StubPathMap paths;
   for (int i = 0; i < static_cast<int>(tp_ffmpeg::kNumStubModules); ++i) {
     tp_ffmpeg::StubModules module = static_cast<tp_ffmpeg::StubModules>(i);
 
     // Add the sumo library first so it takes precedence.
     paths[module].push_back(module_dir.Append(sumo_name).value());
 
     // Add the more specific FFmpeg library name.
     FilePath path = module_dir.Append(GetDSOName(module));
     paths[module].push_back(path.value());
   }
 
-  bool ret = tp_ffmpeg::InitializeStubs(paths);
-  return ret;
+  g_media_library_is_initialized = tp_ffmpeg::InitializeStubs(paths);
+}
+
+bool IsMediaLibraryInitialized() {
+  return g_media_library_is_initialized;
 }
 
 #if defined(OS_LINUX)
 namespace tp_openmax = third_party_openmax;
 bool InitializeOpenMaxLibrary(const FilePath& module_dir) {
   // TODO(ajwong): We need error resolution.
   tp_openmax::StubPathMap paths;
   for (int i = 0; i < static_cast<int>(tp_openmax::kNumStubModules); ++i) {
     tp_openmax::StubModules module = static_cast<tp_openmax::StubModules>(i);
 
     // Add the OpenMAX library first so it takes precedence.
     paths[module].push_back(module_dir.Append(openmax_name).value());
   }
 
   bool result = tp_openmax::InitializeStubs(paths);
   if (!result) {
     LOG(FATAL) << "Cannot load " << openmax_name << "."
                << " Make sure it exists for OpenMAX.";
   }
   return result;
 }
 #else
 bool InitializeOpenMaxLibrary(const FilePath& module_dir) {
   NOTIMPLEMENTED() << "OpenMAX is only used in Linux.";
   return false;
 }
 #endif
 
 }  // namespace media