| Index: third_party/libjingle/overrides/init_webrtc.cc
|
| diff --git a/third_party/libjingle/overrides/init_webrtc.cc b/third_party/libjingle/overrides/init_webrtc.cc
|
| index 3b2e4066a750858581b515b54259038200727c9b..6ba7f04091b640fd17650b3acf5058a83037ef83 100644
|
| --- a/third_party/libjingle/overrides/init_webrtc.cc
|
| +++ b/third_party/libjingle/overrides/init_webrtc.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/command_line.h"
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| +#include "base/logging.h"
|
| #include "base/metrics/field_trial.h"
|
| #include "base/metrics/histogram.h"
|
| #include "base/native_library.h"
|
| @@ -14,6 +15,7 @@
|
| #include "base/trace_event/trace_event.h"
|
| #include "third_party/webrtc/overrides/webrtc/base/basictypes.h"
|
| #include "third_party/webrtc/overrides/webrtc/base/logging.h"
|
| +#include "third_party/webrtc/system_wrappers/interface/event_tracer.h"
|
|
|
| const unsigned char* GetCategoryGroupEnabled(const char* category_group) {
|
| return TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(category_group);
|
| @@ -44,6 +46,12 @@ std::string FindFullName(const std::string& trial_name) {
|
|
|
| // Define webrtc::metrics functions to provide webrtc with implementations.
|
| namespace metrics {
|
| +
|
| +// This class doesn't actually exist, so don't go looking for it :)
|
| +// This type is just fwd declared here in order to use it as an opaque type
|
| +// between the Histogram functions in this file.
|
| +class Histogram;
|
| +
|
| Histogram* HistogramFactoryGetCounts(
|
| const std::string& name, int min, int max, int bucket_count) {
|
| return reinterpret_cast<Histogram*>(
|
| @@ -69,8 +77,6 @@ void HistogramAdd(
|
| } // namespace metrics
|
| } // namespace webrtc
|
|
|
| -#if defined(LIBPEERCONNECTION_LIB)
|
| -
|
| // libpeerconnection is being compiled as a static lib. In this case
|
| // we don't need to do any initializing but to keep things simple we
|
| // provide an empty intialization routine so that this #ifdef doesn't
|
| @@ -79,115 +85,3 @@ bool InitializeWebRtcModule() {
|
| webrtc::SetupEventTracer(&GetCategoryGroupEnabled, &AddTraceEvent);
|
| return true;
|
| }
|
| -
|
| -#else // !LIBPEERCONNECTION_LIB
|
| -
|
| -// When being compiled as a shared library, we need to bridge the gap between
|
| -// the current module and the libpeerconnection module, so things get a tad
|
| -// more complicated.
|
| -
|
| -// Global function pointers to the factory functions in the shared library.
|
| -CreateWebRtcMediaEngineFunction g_create_webrtc_media_engine = NULL;
|
| -DestroyWebRtcMediaEngineFunction g_destroy_webrtc_media_engine = NULL;
|
| -
|
| -// Returns the full or relative path to the libpeerconnection module depending
|
| -// on what platform we're on.
|
| -static base::FilePath GetLibPeerConnectionPath() {
|
| - base::FilePath path;
|
| - CHECK(PathService::Get(base::DIR_MODULE, &path));
|
| -#if defined(OS_WIN)
|
| - path = path.Append(FILE_PATH_LITERAL("libpeerconnection.dll"));
|
| -#elif defined(OS_MACOSX)
|
| - // Simulate '@loader_path/Libraries'.
|
| - path = path.Append(FILE_PATH_LITERAL("Libraries"))
|
| - .Append(FILE_PATH_LITERAL("libpeerconnection.so"));
|
| -#elif defined(OS_ANDROID)
|
| - path = path.Append(FILE_PATH_LITERAL("libpeerconnection.so"));
|
| -#else
|
| - path = path.Append(FILE_PATH_LITERAL("lib"))
|
| - .Append(FILE_PATH_LITERAL("libpeerconnection.so"));
|
| -#endif
|
| - return path;
|
| -}
|
| -
|
| -bool InitializeWebRtcModule() {
|
| - TRACE_EVENT0("webrtc", "InitializeWebRtcModule");
|
| -
|
| - if (g_create_webrtc_media_engine)
|
| - return true; // InitializeWebRtcModule has already been called.
|
| -
|
| - base::FilePath path(GetLibPeerConnectionPath());
|
| - DVLOG(1) << "Loading WebRTC module: " << path.value();
|
| -
|
| - base::NativeLibraryLoadError error;
|
| - static base::NativeLibrary lib = base::LoadNativeLibrary(path, &error);
|
| -#if defined(OS_WIN)
|
| - // We've been seeing problems on Windows with loading the DLL and we're
|
| - // not sure exactly why. It could be that AV programs are quarantining the
|
| - // file or disallowing loading the DLL. To get a better picture of the errors
|
| - // we're checking these specific error codes.
|
| - if (error.code == ERROR_MOD_NOT_FOUND) {
|
| - // It's possible that we get this error due to failure to load other
|
| - // dependencies, so check first that libpeerconnection actually exists.
|
| - CHECK(base::PathExists(path)); // libpeerconnection itself is missing.
|
| - CHECK(lib); // If we hit this, a dependency is missing.
|
| - } else if (error.code == ERROR_ACCESS_DENIED) {
|
| - CHECK(lib); // AV blocking access?
|
| - }
|
| -#endif
|
| -
|
| - // Catch-all error handler for all other sorts of errors.
|
| - CHECK(lib) << error.ToString();
|
| -
|
| - InitializeModuleFunction initialize_module =
|
| - reinterpret_cast<InitializeModuleFunction>(
|
| - base::GetFunctionPointerFromNativeLibrary(
|
| - lib, "InitializeModule"));
|
| -
|
| - // Initialize the proxy by supplying it with a pointer to our
|
| - // allocator/deallocator routines.
|
| - // On mac we use malloc zones, which are global, so we provide NULLs for
|
| - // the alloc/dealloc functions.
|
| - // PS: This function is actually implemented in allocator_proxy.cc with the
|
| - // new/delete overrides.
|
| - InitDiagnosticLoggingDelegateFunctionFunction init_diagnostic_logging = NULL;
|
| - bool init_ok = initialize_module(*base::CommandLine::ForCurrentProcess(),
|
| -#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
| - &Allocate,
|
| - &Dellocate,
|
| -#endif
|
| - &webrtc::field_trial::FindFullName,
|
| - &webrtc::metrics::HistogramFactoryGetCounts,
|
| - &webrtc::metrics::HistogramFactoryGetEnumeration,
|
| - &webrtc::metrics::HistogramAdd,
|
| - logging::GetLogMessageHandler(),
|
| - &GetCategoryGroupEnabled,
|
| - &AddTraceEvent,
|
| - &g_create_webrtc_media_engine,
|
| - &g_destroy_webrtc_media_engine,
|
| - &init_diagnostic_logging);
|
| -
|
| - if (init_ok)
|
| - rtc::SetExtraLoggingInit(init_diagnostic_logging);
|
| - return init_ok;
|
| -}
|
| -
|
| -cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
|
| - webrtc::AudioDeviceModule* adm,
|
| - webrtc::AudioDeviceModule* adm_sc,
|
| - cricket::WebRtcVideoEncoderFactory* encoder_factory,
|
| - cricket::WebRtcVideoDecoderFactory* decoder_factory) {
|
| - // For convenience of tests etc, we call InitializeWebRtcModule here.
|
| - // For Chrome however, InitializeWebRtcModule must be called
|
| - // explicitly before the sandbox is initialized. In that case, this call is
|
| - // effectively a noop.
|
| - InitializeWebRtcModule();
|
| - return g_create_webrtc_media_engine(adm, adm_sc, encoder_factory,
|
| - decoder_factory);
|
| -}
|
| -
|
| -void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
|
| - g_destroy_webrtc_media_engine(media_engine);
|
| -}
|
| -
|
| -#endif // LIBPEERCONNECTION_LIB
|
|
|