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

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

Issue 717203002: Revert of Reland 597923002: Fix the way how we create webrtc::AudioProcessing in Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build/android/pylib/utils/isolator.py Created 6 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
« no previous file with comments | « third_party/libjingle/libjingle.gyp ('k') | 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 <string> 8 #include <string>
9 9
10 #include "allocator_shim/allocator_stub.h" 10 #include "allocator_shim/allocator_stub.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "third_party/webrtc/system_wrappers/interface/event_tracer.h" 12 #include "third_party/webrtc/system_wrappers/interface/event_tracer.h"
13 13
14 namespace base { 14 namespace base {
15 class CommandLine; 15 class CommandLine;
16 } 16 }
17 17
18 namespace cricket { 18 namespace cricket {
19 class MediaEngineInterface; 19 class MediaEngineInterface;
20 class WebRtcVideoDecoderFactory; 20 class WebRtcVideoDecoderFactory;
21 class WebRtcVideoEncoderFactory; 21 class WebRtcVideoEncoderFactory;
22 } // namespace cricket 22 } // namespace cricket
23 23
24 namespace webrtc { 24 namespace webrtc {
25 class AudioDeviceModule; 25 class AudioDeviceModule;
26 class AudioProcessing;
27 class Config;
28 namespace metrics { 26 namespace metrics {
29 class Histogram; 27 class Histogram;
30 } // namespace metrics 28 } // namespace metrics
31 } // namespace webrtc 29 } // namespace webrtc
32 30
33 typedef std::string (*FieldTrialFindFullName)(const std::string& trial_name); 31 typedef std::string (*FieldTrialFindFullName)(const std::string& trial_name);
34 32
35 typedef webrtc::metrics::Histogram* (*RtcHistogramFactoryGetCounts)( 33 typedef webrtc::metrics::Histogram* (*RtcHistogramFactoryGetCounts)(
36 const std::string& name, int min, int max, int bucket_count); 34 const std::string& name, int min, int max, int bucket_count);
37 typedef webrtc::metrics::Histogram* (*RtcHistogramFactoryGetEnumeration)( 35 typedef webrtc::metrics::Histogram* (*RtcHistogramFactoryGetEnumeration)(
38 const std::string& name, int boundary); 36 const std::string& name, int boundary);
39 typedef void (*RtcHistogramAdd)( 37 typedef void (*RtcHistogramAdd)(
40 webrtc::metrics::Histogram* histogram_pointer, 38 webrtc::metrics::Histogram* histogram_pointer,
41 const std::string& name, 39 const std::string& name,
42 int sample); 40 int sample);
43 41
44 typedef cricket::MediaEngineInterface* (*CreateWebRtcMediaEngineFunction)( 42 typedef cricket::MediaEngineInterface* (*CreateWebRtcMediaEngineFunction)(
45 webrtc::AudioDeviceModule* adm, 43 webrtc::AudioDeviceModule* adm,
46 webrtc::AudioDeviceModule* adm_sc, 44 webrtc::AudioDeviceModule* adm_sc,
47 cricket::WebRtcVideoEncoderFactory* encoder_factory, 45 cricket::WebRtcVideoEncoderFactory* encoder_factory,
48 cricket::WebRtcVideoDecoderFactory* decoder_factory); 46 cricket::WebRtcVideoDecoderFactory* decoder_factory);
49 47
50 typedef void (*DestroyWebRtcMediaEngineFunction)( 48 typedef void (*DestroyWebRtcMediaEngineFunction)(
51 cricket::MediaEngineInterface* media_engine); 49 cricket::MediaEngineInterface* media_engine);
52 50
53 typedef void (*InitDiagnosticLoggingDelegateFunctionFunction)( 51 typedef void (*InitDiagnosticLoggingDelegateFunctionFunction)(
54 void (*DelegateFunction)(const std::string&)); 52 void (*DelegateFunction)(const std::string&));
55 53
56 typedef webrtc::AudioProcessing* (*CreateWebRtcAudioProcessingFunction)(
57 const webrtc::Config& config);
58
59 // A typedef for the main initialize function in libpeerconnection. 54 // A typedef for the main initialize function in libpeerconnection.
60 // This will initialize logging in the module with the proper arguments 55 // This will initialize logging in the module with the proper arguments
61 // as well as provide pointers back to a couple webrtc factory functions. 56 // as well as provide pointers back to a couple webrtc factory functions.
62 // The reason we get pointers to these functions this way is to avoid having 57 // The reason we get pointers to these functions this way is to avoid having
63 // to go through GetProcAddress et al and rely on specific name mangling. 58 // to go through GetProcAddress et al and rely on specific name mangling.
64 // TODO(tommi): The number of functions is growing. Use a struct. 59 // TODO(tommi): The number of functions is growing. Use a struct.
65 typedef bool (*InitializeModuleFunction)( 60 typedef bool (*InitializeModuleFunction)(
66 const base::CommandLine& command_line, 61 const base::CommandLine& command_line,
67 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) 62 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
68 AllocateFunction alloc, 63 AllocateFunction alloc,
69 DellocateFunction dealloc, 64 DellocateFunction dealloc,
70 #endif 65 #endif
71 FieldTrialFindFullName field_trial_find, 66 FieldTrialFindFullName field_trial_find,
72 RtcHistogramFactoryGetCounts factory_get_counts, 67 RtcHistogramFactoryGetCounts factory_get_counts,
73 RtcHistogramFactoryGetEnumeration factory_get_enumeration, 68 RtcHistogramFactoryGetEnumeration factory_get_enumeration,
74 RtcHistogramAdd histogram_add, 69 RtcHistogramAdd histogram_add,
75 logging::LogMessageHandlerFunction log_handler, 70 logging::LogMessageHandlerFunction log_handler,
76 webrtc::GetCategoryEnabledPtr trace_get_category_enabled, 71 webrtc::GetCategoryEnabledPtr trace_get_category_enabled,
77 webrtc::AddTraceEventPtr trace_add_trace_event, 72 webrtc::AddTraceEventPtr trace_add_trace_event,
78 CreateWebRtcMediaEngineFunction* create_media_engine, 73 CreateWebRtcMediaEngineFunction* create_media_engine,
79 DestroyWebRtcMediaEngineFunction* destroy_media_engine, 74 DestroyWebRtcMediaEngineFunction* destroy_media_engine,
80 InitDiagnosticLoggingDelegateFunctionFunction* init_diagnostic_logging, 75 InitDiagnosticLoggingDelegateFunctionFunction* init_diagnostic_logging);
81 CreateWebRtcAudioProcessingFunction* create_audio_processing);
82 76
83 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION) 77 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION)
84 // Load and initialize the shared WebRTC module (libpeerconnection). 78 // Load and initialize the shared WebRTC module (libpeerconnection).
85 // Call this explicitly to load and initialize the WebRTC module (e.g. before 79 // Call this explicitly to load and initialize the WebRTC module (e.g. before
86 // initializing the sandbox in Chrome). 80 // initializing the sandbox in Chrome).
87 // If not called explicitly, this function will still be called from the main 81 // If not called explicitly, this function will still be called from the main
88 // CreateWebRtcMediaEngine factory function the first time it is called. 82 // CreateWebRtcMediaEngine factory function the first time it is called.
89 bool InitializeWebRtcModule(); 83 bool InitializeWebRtcModule();
90
91 // Return a webrtc::AudioProcessing object.
92 webrtc::AudioProcessing* CreateWebRtcAudioProcessing(
93 const webrtc::Config& config);
94
95 #endif 84 #endif
96 85
97 #endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_ 86 #endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_
OLDNEW
« no previous file with comments | « third_party/libjingle/libjingle.gyp ('k') | third_party/libjingle/overrides/init_webrtc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698