OLD | NEW |
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 | 10 |
10 class CommandLine; | 11 class CommandLine; |
11 | 12 |
12 namespace cricket { | 13 namespace cricket { |
13 class MediaEngineInterface; | 14 class MediaEngineInterface; |
14 class WebRtcVideoDecoderFactory; | 15 class WebRtcVideoDecoderFactory; |
15 class WebRtcVideoEncoderFactory; | 16 class WebRtcVideoEncoderFactory; |
16 } // namespace cricket | 17 } // namespace cricket |
17 | 18 |
18 namespace webrtc { | 19 namespace webrtc { |
(...skipping 13 matching lines...) Expand all Loading... |
32 // This will initialize logging in the module with the proper arguments | 33 // This will initialize logging in the module with the proper arguments |
33 // as well as provide pointers back to a couple webrtc factory functions. | 34 // as well as provide pointers back to a couple webrtc factory functions. |
34 // The reason we get pointers to these functions this way is to avoid having | 35 // The reason we get pointers to these functions this way is to avoid having |
35 // to go through GetProcAddress et al and rely on specific name mangling. | 36 // to go through GetProcAddress et al and rely on specific name mangling. |
36 typedef bool (*InitializeModuleFunction)( | 37 typedef bool (*InitializeModuleFunction)( |
37 const CommandLine& command_line, | 38 const CommandLine& command_line, |
38 #if !defined(OS_MACOSX) | 39 #if !defined(OS_MACOSX) |
39 AllocateFunction alloc, | 40 AllocateFunction alloc, |
40 DellocateFunction dealloc, | 41 DellocateFunction dealloc, |
41 #endif | 42 #endif |
| 43 logging::LogMessageHandlerFunction log_handler, |
42 CreateWebRtcMediaEngineFunction* create_media_engine, | 44 CreateWebRtcMediaEngineFunction* create_media_engine, |
43 DestroyWebRtcMediaEngineFunction* destroy_media_engine); | 45 DestroyWebRtcMediaEngineFunction* destroy_media_engine); |
44 | 46 |
45 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION) | 47 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION) |
46 // Load and initialize the shared WebRTC module (libpeerconnection). | 48 // Load and initialize the shared WebRTC module (libpeerconnection). |
47 // Call this explicitly to load and initialize the WebRTC module (e.g. before | 49 // Call this explicitly to load and initialize the WebRTC module (e.g. before |
48 // initializing the sandbox in Chrome). | 50 // initializing the sandbox in Chrome). |
49 // If not called explicitly, this function will still be called from the main | 51 // If not called explicitly, this function will still be called from the main |
50 // CreateWebRtcMediaEngine factory function the first time it is called. | 52 // CreateWebRtcMediaEngine factory function the first time it is called. |
51 bool InitializeWebRtcModule(); | 53 bool InitializeWebRtcModule(); |
52 #endif | 54 #endif |
53 | 55 |
54 #endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_ | 56 #endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_ |
OLD | NEW |