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 #include "allocator_shim/allocator_stub.h" | 5 #include "allocator_shim/allocator_stub.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "init_webrtc.h" | 9 #include "init_webrtc.h" |
10 #include "talk/media/webrtc/webrtcmediaengine.h" | 10 #include "talk/media/webrtc/webrtcmediaengine.h" |
| 11 #include "third_party/webrtc/modules/audio_processing/include/audio_processing.h
" |
11 #include "webrtc/base/basictypes.h" | 12 #include "webrtc/base/basictypes.h" |
12 #include "webrtc/base/logging.h" | 13 #include "webrtc/base/logging.h" |
13 | 14 |
14 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION) || defined(LIBPEERCONNECTION_LIB) | 15 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION) || defined(LIBPEERCONNECTION_LIB) |
15 #error "Only compile the allocator proxy with the shared_library implementation" | 16 #error "Only compile the allocator proxy with the shared_library implementation" |
16 #endif | 17 #endif |
17 | 18 |
18 #if defined(OS_WIN) | 19 #if defined(OS_WIN) |
19 #define ALLOC_EXPORT __declspec(dllexport) | 20 #define ALLOC_EXPORT __declspec(dllexport) |
20 #else | 21 #else |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 AllocateFunction alloc, | 65 AllocateFunction alloc, |
65 DellocateFunction dealloc, | 66 DellocateFunction dealloc, |
66 #endif | 67 #endif |
67 FieldTrialFindFullName field_trial_find, | 68 FieldTrialFindFullName field_trial_find, |
68 logging::LogMessageHandlerFunction log_handler, | 69 logging::LogMessageHandlerFunction log_handler, |
69 webrtc::GetCategoryEnabledPtr trace_get_category_enabled, | 70 webrtc::GetCategoryEnabledPtr trace_get_category_enabled, |
70 webrtc::AddTraceEventPtr trace_add_trace_event, | 71 webrtc::AddTraceEventPtr trace_add_trace_event, |
71 CreateWebRtcMediaEngineFunction* create_media_engine, | 72 CreateWebRtcMediaEngineFunction* create_media_engine, |
72 DestroyWebRtcMediaEngineFunction* destroy_media_engine, | 73 DestroyWebRtcMediaEngineFunction* destroy_media_engine, |
73 InitDiagnosticLoggingDelegateFunctionFunction* | 74 InitDiagnosticLoggingDelegateFunctionFunction* |
74 init_diagnostic_logging) { | 75 init_diagnostic_logging, |
| 76 CreateWebRtcAudioProcessingFunction* |
| 77 create_audio_processing) { |
75 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) | 78 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) |
76 g_alloc = alloc; | 79 g_alloc = alloc; |
77 g_dealloc = dealloc; | 80 g_dealloc = dealloc; |
78 #endif | 81 #endif |
79 | 82 |
80 g_field_trial_find_ = field_trial_find; | 83 g_field_trial_find_ = field_trial_find; |
81 | 84 |
82 *create_media_engine = &CreateWebRtcMediaEngine; | 85 *create_media_engine = &CreateWebRtcMediaEngine; |
83 *destroy_media_engine = &DestroyWebRtcMediaEngine; | 86 *destroy_media_engine = &DestroyWebRtcMediaEngine; |
84 *init_diagnostic_logging = &rtc::InitDiagnosticLoggingDelegateFunction; | 87 *init_diagnostic_logging = &rtc::InitDiagnosticLoggingDelegateFunction; |
| 88 *create_audio_processing = &webrtc::AudioProcessing::Create; |
85 | 89 |
86 if (CommandLine::Init(0, NULL)) { | 90 if (CommandLine::Init(0, NULL)) { |
87 #if !defined(OS_WIN) | 91 #if !defined(OS_WIN) |
88 // This is not needed on Windows since CommandLine::Init has already | 92 // This is not needed on Windows since CommandLine::Init has already |
89 // done the equivalent thing via the GetCommandLine() API. | 93 // done the equivalent thing via the GetCommandLine() API. |
90 CommandLine::ForCurrentProcess()->AppendArguments(command_line, true); | 94 CommandLine::ForCurrentProcess()->AppendArguments(command_line, true); |
91 #endif | 95 #endif |
92 logging::LoggingSettings settings; | 96 logging::LoggingSettings settings; |
93 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; | 97 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; |
94 logging::InitLogging(settings); | 98 logging::InitLogging(settings); |
95 | 99 |
96 // Override the log message handler to forward logs to chrome's handler. | 100 // Override the log message handler to forward logs to chrome's handler. |
97 logging::SetLogMessageHandler(log_handler); | 101 logging::SetLogMessageHandler(log_handler); |
98 webrtc::SetupEventTracer(trace_get_category_enabled, | 102 webrtc::SetupEventTracer(trace_get_category_enabled, |
99 trace_add_trace_event); | 103 trace_add_trace_event); |
100 } | 104 } |
101 | 105 |
102 return true; | 106 return true; |
103 } | 107 } |
104 } // extern "C" | 108 } // extern "C" |
OLD | NEW |