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

Unified Diff: third_party/libjingle/overrides/init_webrtc.h

Issue 1146123002: Remove unused libpeerconnection code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert a couple of libjingle.gyp changes Created 5 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
Index: third_party/libjingle/overrides/init_webrtc.h
diff --git a/third_party/libjingle/overrides/init_webrtc.h b/third_party/libjingle/overrides/init_webrtc.h
index 23a7f8a5533a29b095086b9dd2d3fd8035e4fce7..4a7db383a15f1b5105a4daf884e5dc99b940e655 100644
--- a/third_party/libjingle/overrides/init_webrtc.h
+++ b/third_party/libjingle/overrides/init_webrtc.h
@@ -5,82 +5,9 @@
#ifndef THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_
#define THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_
-#include <string>
-
-#include "third_party/libjingle/overrides/allocator_shim/allocator_stub.h"
-#include "base/logging.h"
-#include "third_party/webrtc/system_wrappers/interface/event_tracer.h"
-
-namespace base {
-class CommandLine;
-}
-
-namespace cricket {
-class MediaEngineInterface;
-class WebRtcVideoDecoderFactory;
-class WebRtcVideoEncoderFactory;
-} // namespace cricket
-
-namespace webrtc {
-class AudioDeviceModule;
-namespace metrics {
-class Histogram;
-} // namespace metrics
-} // namespace webrtc
-
-typedef std::string (*FieldTrialFindFullName)(const std::string& trial_name);
-
-typedef webrtc::metrics::Histogram* (*RtcHistogramFactoryGetCounts)(
- const std::string& name, int min, int max, int bucket_count);
-typedef webrtc::metrics::Histogram* (*RtcHistogramFactoryGetEnumeration)(
- const std::string& name, int boundary);
-typedef void (*RtcHistogramAdd)(
- webrtc::metrics::Histogram* histogram_pointer,
- const std::string& name,
- int sample);
-
-typedef cricket::MediaEngineInterface* (*CreateWebRtcMediaEngineFunction)(
- webrtc::AudioDeviceModule* adm,
- webrtc::AudioDeviceModule* adm_sc,
- cricket::WebRtcVideoEncoderFactory* encoder_factory,
- cricket::WebRtcVideoDecoderFactory* decoder_factory);
-
-typedef void (*DestroyWebRtcMediaEngineFunction)(
- cricket::MediaEngineInterface* media_engine);
-
-typedef void (*InitDiagnosticLoggingDelegateFunctionFunction)(
- void (*DelegateFunction)(const std::string&));
-
-// A typedef for the main initialize function in libpeerconnection.
-// This will initialize logging in the module with the proper arguments
-// as well as provide pointers back to a couple webrtc factory functions.
-// The reason we get pointers to these functions this way is to avoid having
-// to go through GetProcAddress et al and rely on specific name mangling.
-// TODO(tommi): The number of functions is growing. Use a struct.
-typedef bool (*InitializeModuleFunction)(
- const base::CommandLine& command_line,
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
- AllocateFunction alloc,
- DellocateFunction dealloc,
-#endif
- FieldTrialFindFullName field_trial_find,
- RtcHistogramFactoryGetCounts factory_get_counts,
- RtcHistogramFactoryGetEnumeration factory_get_enumeration,
- RtcHistogramAdd histogram_add,
- logging::LogMessageHandlerFunction log_handler,
- webrtc::GetCategoryEnabledPtr trace_get_category_enabled,
- webrtc::AddTraceEventPtr trace_add_trace_event,
- CreateWebRtcMediaEngineFunction* create_media_engine,
- DestroyWebRtcMediaEngineFunction* destroy_media_engine,
- InitDiagnosticLoggingDelegateFunctionFunction* init_diagnostic_logging);
-
-#if !defined(LIBPEERCONNECTION_IMPLEMENTATION)
-// Load and initialize the shared WebRTC module (libpeerconnection).
-// Call this explicitly to load and initialize the WebRTC module (e.g. before
-// initializing the sandbox in Chrome).
-// If not called explicitly, this function will still be called from the main
-// CreateWebRtcMediaEngine factory function the first time it is called.
+// Initialize WebRTC. Call this explicitly to initialize WebRTC module
+// (before initializing the sandbox in Chrome) and hook up Chrome+WebRTC
+// integration such as common logging and tracing.
bool InitializeWebRtcModule();
-#endif
#endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_
« no previous file with comments | « third_party/libjingle/overrides/allocator_shim/allocator_stub.cc ('k') | third_party/libjingle/overrides/init_webrtc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698