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

Unified Diff: media/base/media_posix.cc

Issue 10837118: Dead code elimination: scythe.chrome_functions:segment.path %media% edition, round 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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 side-by-side diff with in-line comments
Download patch
Index: media/base/media_posix.cc
diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc
index 52ad34f1cfa9fc1108f4817552d9b92539993237..7028ae26cddbf778888c96dfd022bf8f300b1616 100644
--- a/media/base/media_posix.cc
+++ b/media/base/media_posix.cc
@@ -15,10 +15,6 @@
#include "base/stringize_macros.h"
#include "media/ffmpeg/ffmpeg_common.h"
#include "third_party/ffmpeg/ffmpeg_stubs.h"
-#if defined(OS_LINUX)
-// OpenMAX IL stub is generated only on Linux.
-#include "third_party/openmax/il_stubs.h"
-#endif
namespace tp_ffmpeg = third_party_ffmpeg;
@@ -102,30 +98,4 @@ 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

Powered by Google App Engine
This is Rietveld 408576698