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

Side by Side Diff: media/base/media_win.cc

Issue 7587012: Remove mock_ffmpeg and update media unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments. Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <windows.h> 7 #include <windows.h>
8 8
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 // Free any loaded libraries if we weren't successful. 71 // Free any loaded libraries if we weren't successful.
72 for (size_t i = 0; i < arraysize(libs) && libs[i] != NULL; ++i) { 72 for (size_t i = 0; i < arraysize(libs) && libs[i] != NULL; ++i) {
73 FreeLibrary(libs[i]); 73 FreeLibrary(libs[i]);
74 libs[i] = NULL; // Just to be safe. 74 libs[i] = NULL; // Just to be safe.
75 } 75 }
76 } 76 }
77 77
78 return g_media_library_is_initialized; 78 return g_media_library_is_initialized;
79 } 79 }
80 80
81 void InitializeMediaLibraryForTesting() {
82 FilePath file_path;
83 CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
84 CHECK(InitializeMediaLibrary(file_path));
85 }
86
81 bool IsMediaLibraryInitialized() { 87 bool IsMediaLibraryInitialized() {
82 return g_media_library_is_initialized; 88 return g_media_library_is_initialized;
83 } 89 }
84 90
85 bool InitializeOpenMaxLibrary(const FilePath& module_dir) { 91 bool InitializeOpenMaxLibrary(const FilePath& module_dir) {
86 NOTIMPLEMENTED() << "OpenMAX is not used in Windows."; 92 NOTIMPLEMENTED() << "OpenMAX is not used in Windows.";
87 return false; 93 return false;
88 } 94 }
89 95
90 } // namespace media 96 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698