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

Unified Diff: webrtc/media/base/mediaengine.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rename back test to libjingle_media_unittest Created 4 years, 11 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: webrtc/media/base/mediaengine.cc
diff --git a/webrtc/media/base/mediaengine.cc b/webrtc/media/base/mediaengine.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b3d39ec8584e502cfcfcaa7d1c7f5c132acfea7a
--- /dev/null
+++ b/webrtc/media/base/mediaengine.cc
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "webrtc/media/base/mediaengine.h"
+
+#if !defined(DISABLE_MEDIA_ENGINE_FACTORY)
+
+#if defined(HAVE_WEBRTC_VOICE) && defined(HAVE_WEBRTC_VIDEO)
+#include "webrtc/media/webrtc/webrtcmediaengine.h"
+#endif // HAVE_WEBRTC_VOICE && HAVE_WEBRTC_VIDEO
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif // HAVE_CONFIG
+
+namespace cricket {
+
+MediaEngineFactory::MediaEngineCreateFunction
+ MediaEngineFactory::create_function_ = NULL;
+
+MediaEngineFactory::MediaEngineCreateFunction
+ MediaEngineFactory::SetCreateFunction(MediaEngineCreateFunction function) {
+ MediaEngineCreateFunction old_function = create_function_;
+ create_function_ = function;
+ return old_function;
+}
+
+}; // namespace cricket
+
+#endif // DISABLE_MEDIA_ENGINE_FACTORY

Powered by Google App Engine
This is Rietveld 408576698