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

Unified Diff: third_party/libjingle/overrides/initialize_module.cc

Issue 14847015: Fix libpeerconnection build after a recent libjingle roll that added an encoder factory to webrtc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
« no previous file with comments | « third_party/libjingle/overrides/init_webrtc.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/overrides/initialize_module.cc
diff --git a/third_party/libjingle/overrides/initialize_module.cc b/third_party/libjingle/overrides/initialize_module.cc
index 8c70f4f7729d93d5f08a8ca3da56407d20dadc01..c3d608d7a0d383d848027204a1235dc832ef00f8 100644
--- a/third_party/libjingle/overrides/initialize_module.cc
+++ b/third_party/libjingle/overrides/initialize_module.cc
@@ -6,6 +6,7 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/logging.h"
+#include "init_webrtc.h"
#include "talk/base/basictypes.h"
#include "talk/media/webrtc/webrtcmediaengine.h"
@@ -19,13 +20,6 @@
#define ALLOC_EXPORT __attribute__((visibility("default")))
#endif
-typedef cricket::MediaEngineInterface* (*CreateWebRtcMediaEngineFunction)(
- webrtc::AudioDeviceModule* adm,
- webrtc::AudioDeviceModule* adm_sc,
- cricket::WebRtcVideoDecoderFactory* decoder_factory);
-typedef void (*DestroyWebRtcMediaEngineFunction)(
- cricket::MediaEngineInterface* media_engine);
-
#if !defined(OS_MACOSX)
// These are used by our new/delete overrides in
// allocator_shim/allocator_proxy.cc
@@ -36,7 +30,9 @@ DellocateFunction g_dealloc = NULL;
// Forward declare of the libjingle internal factory and destroy methods for the
// WebRTC media engine.
cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
- webrtc::AudioDeviceModule* adm, webrtc::AudioDeviceModule* adm_sc,
+ webrtc::AudioDeviceModule* adm,
+ webrtc::AudioDeviceModule* adm_sc,
+ cricket::WebRtcVideoEncoderFactory* encoder_factory,
cricket::WebRtcVideoDecoderFactory* decoder_factory);
void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine);
@@ -68,6 +64,8 @@ bool InitializeModule(const CommandLine& command_line,
// done the equivalent thing via the GetCommandLine() API.
CommandLine::ForCurrentProcess()->AppendArguments(command_line, true);
#endif
+
+ // TODO(tommi): Use SetLogMessageHandler.
logging::InitLogging(
FILE_PATH_LITERAL("libpeerconnection.log"),
logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
« no previous file with comments | « third_party/libjingle/overrides/init_webrtc.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698