Move media library path resolution into Chrome path provider.

media/base/media_win.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 <windows.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 28 matching lines @@
     case FILE_LIBAVFORMAT:
       return FILE_PATH_LITERAL("avformat-52.dll");
     case FILE_LIBAVUTIL:
       return FILE_PATH_LITERAL("avutil-50.dll");
     default:
       LOG(DFATAL) << "Invalid DLL key requested: " << dll_key;
       return FILE_PATH_LITERAL("");
   }
 }
 
+static bool g_media_library_is_initialized = false;
+
 }  // namespace
 
 // Attempts to initialize the media library (loading DLLs, DSOs, etc.).
 // Returns true if everything was successfully initialized, false otherwise.
-bool InitializeMediaLibrary(const FilePath& base_path) {
+void InitializeMediaLibrary(const FilePath& base_path) {
+  if (g_media_library_is_initialized)
+    return;
+
   FFmpegDLLKeys path_keys[] = {
     media::FILE_LIBAVCODEC,
     media::FILE_LIBAVFORMAT,
     media::FILE_LIBAVUTIL
   };
   HMODULE libs[arraysize(path_keys)] = {NULL};
 
   for (size_t i = 0; i < arraysize(path_keys); ++i) {
     FilePath path = base_path.Append(GetDLLName(path_keys[i]));
 #ifdef TESTING
@@ skipping 11 matching lines @@
     std::wstring outputbuf = StringPrintf(L"DLL loadtime %5.2f ms, %ls\n",
         (dll_loadtime_end - dll_loadtime_start).InMillisecondsF(),
         cpath);
     OutputDebugStringW(outputbuf.c_str());
 #endif
   }
 
   // Check that we loaded all libraries successfully.  We only need to check the
   // last array element because the loop above will break without initializing
   // it on any prior error.
-  if (libs[arraysize(libs)-1])
-    return true;
+  g_media_library_is_initialized = (libs[arraysize(libs)-1] != NULL);

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

Remove outer parens.  Not necessary.

 
-  // Free any loaded libraries if we weren't successful.
-  for (size_t i = 0; i < arraysize(libs) && libs[i] != NULL; ++i) {
-    FreeLibrary(libs[i]);
-    libs[i] = NULL;  // Just to be safe.
+  if (!g_media_library_is_initialized) {
+    // Free any loaded libraries if we weren't successful.
+    for (size_t i = 0; i < arraysize(libs) && libs[i] != NULL; ++i) {
+      FreeLibrary(libs[i]);
+      libs[i] = NULL;  // Just to be safe.
+    }
   }
-  return false;
+}
+
+bool IsMediaLibraryInitialized() {
+  return g_media_library_is_initialized;
 }
 
 bool InitializeOpenMaxLibrary(const FilePath& module_dir) {
   NOTIMPLEMENTED() << "OpenMAX is not used in Windows.";
   return false;
 }
 
 }  // namespace media