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

Side by Side Diff: third_party/libjingle/overrides/init_webrtc.h

Issue 71353010: Fix WebRTC logging so that logs from libpeerconnection make it to the log. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review. Created 7 years, 1 month 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
« no previous file with comments | « no previous file | third_party/libjingle/overrides/init_webrtc.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_ 5 #ifndef THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_
6 #define THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_ 6 #define THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_
7 7
8 #include "allocator_shim/allocator_stub.h" 8 #include "allocator_shim/allocator_stub.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "third_party/webrtc/system_wrappers/interface/event_tracer.h" 10 #include "third_party/webrtc/system_wrappers/interface/event_tracer.h"
(...skipping 12 matching lines...) Expand all
23 23
24 typedef cricket::MediaEngineInterface* (*CreateWebRtcMediaEngineFunction)( 24 typedef cricket::MediaEngineInterface* (*CreateWebRtcMediaEngineFunction)(
25 webrtc::AudioDeviceModule* adm, 25 webrtc::AudioDeviceModule* adm,
26 webrtc::AudioDeviceModule* adm_sc, 26 webrtc::AudioDeviceModule* adm_sc,
27 cricket::WebRtcVideoEncoderFactory* encoder_factory, 27 cricket::WebRtcVideoEncoderFactory* encoder_factory,
28 cricket::WebRtcVideoDecoderFactory* decoder_factory); 28 cricket::WebRtcVideoDecoderFactory* decoder_factory);
29 29
30 typedef void (*DestroyWebRtcMediaEngineFunction)( 30 typedef void (*DestroyWebRtcMediaEngineFunction)(
31 cricket::MediaEngineInterface* media_engine); 31 cricket::MediaEngineInterface* media_engine);
32 32
33 typedef void (*InitDiagnosticLoggingDelegateFunctionFunction)(
34 void (*DelegateFunction)(const std::string&));
35
33 // A typedef for the main initialize function in libpeerconnection. 36 // A typedef for the main initialize function in libpeerconnection.
34 // This will initialize logging in the module with the proper arguments 37 // This will initialize logging in the module with the proper arguments
35 // as well as provide pointers back to a couple webrtc factory functions. 38 // as well as provide pointers back to a couple webrtc factory functions.
36 // The reason we get pointers to these functions this way is to avoid having 39 // The reason we get pointers to these functions this way is to avoid having
37 // to go through GetProcAddress et al and rely on specific name mangling. 40 // to go through GetProcAddress et al and rely on specific name mangling.
38 typedef bool (*InitializeModuleFunction)( 41 typedef bool (*InitializeModuleFunction)(
39 const CommandLine& command_line, 42 const CommandLine& command_line,
40 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) 43 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
41 AllocateFunction alloc, 44 AllocateFunction alloc,
42 DellocateFunction dealloc, 45 DellocateFunction dealloc,
43 #endif 46 #endif
44 logging::LogMessageHandlerFunction log_handler, 47 logging::LogMessageHandlerFunction log_handler,
45 webrtc::GetCategoryEnabledPtr trace_get_category_enabled, 48 webrtc::GetCategoryEnabledPtr trace_get_category_enabled,
46 webrtc::AddTraceEventPtr trace_add_trace_event, 49 webrtc::AddTraceEventPtr trace_add_trace_event,
47 CreateWebRtcMediaEngineFunction* create_media_engine, 50 CreateWebRtcMediaEngineFunction* create_media_engine,
48 DestroyWebRtcMediaEngineFunction* destroy_media_engine); 51 DestroyWebRtcMediaEngineFunction* destroy_media_engine,
52 InitDiagnosticLoggingDelegateFunctionFunction* init_diagnostic_logging);
49 53
50 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION) 54 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION)
51 // Load and initialize the shared WebRTC module (libpeerconnection). 55 // Load and initialize the shared WebRTC module (libpeerconnection).
52 // Call this explicitly to load and initialize the WebRTC module (e.g. before 56 // Call this explicitly to load and initialize the WebRTC module (e.g. before
53 // initializing the sandbox in Chrome). 57 // initializing the sandbox in Chrome).
54 // If not called explicitly, this function will still be called from the main 58 // If not called explicitly, this function will still be called from the main
55 // CreateWebRtcMediaEngine factory function the first time it is called. 59 // CreateWebRtcMediaEngine factory function the first time it is called.
56 bool InitializeWebRtcModule(); 60 bool InitializeWebRtcModule();
57 #endif 61 #endif
58 62
59 #endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_ 63 #endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_
OLDNEW
« no previous file with comments | « no previous file | third_party/libjingle/overrides/init_webrtc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698