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

Side by Side Diff: webrtc/media/base/mediaengine.cc

Issue 1684163002: Rename webrtc/media/webrtc -> webrtc/media/engine (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase f396f6085f9e4f16f37471a7828e3e31308c0d52 #11590 Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « webrtc/media/base/fakevideocapturer.h ('k') | webrtc/media/base/videocapturer.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 /* 1 /*
2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/media/base/mediaengine.h" 11 #include "webrtc/media/base/mediaengine.h"
12 12
13 #if !defined(DISABLE_MEDIA_ENGINE_FACTORY) 13 #if !defined(DISABLE_MEDIA_ENGINE_FACTORY)
14 14
15 #if defined(HAVE_WEBRTC_VOICE) && defined(HAVE_WEBRTC_VIDEO) 15 #if defined(HAVE_WEBRTC_VOICE) && defined(HAVE_WEBRTC_VIDEO)
16 #include "webrtc/media/webrtc/webrtcmediaengine.h" 16 #include "webrtc/media/engine/webrtcmediaengine.h"
17 #endif // HAVE_WEBRTC_VOICE && HAVE_WEBRTC_VIDEO 17 #endif // HAVE_WEBRTC_VOICE && HAVE_WEBRTC_VIDEO
18 18
19 #ifdef HAVE_CONFIG_H 19 #ifdef HAVE_CONFIG_H
20 #include "config.h" 20 #include "config.h"
21 #endif // HAVE_CONFIG 21 #endif // HAVE_CONFIG
22 22
23 namespace cricket { 23 namespace cricket {
24 24
25 MediaEngineFactory::MediaEngineCreateFunction 25 MediaEngineFactory::MediaEngineCreateFunction
26 MediaEngineFactory::create_function_ = NULL; 26 MediaEngineFactory::create_function_ = NULL;
27 27
28 MediaEngineFactory::MediaEngineCreateFunction 28 MediaEngineFactory::MediaEngineCreateFunction
29 MediaEngineFactory::SetCreateFunction(MediaEngineCreateFunction function) { 29 MediaEngineFactory::SetCreateFunction(MediaEngineCreateFunction function) {
30 MediaEngineCreateFunction old_function = create_function_; 30 MediaEngineCreateFunction old_function = create_function_;
31 create_function_ = function; 31 create_function_ = function;
32 return old_function; 32 return old_function;
33 } 33 }
34 34
35 }; // namespace cricket 35 }; // namespace cricket
36 36
37 #endif // DISABLE_MEDIA_ENGINE_FACTORY 37 #endif // DISABLE_MEDIA_ENGINE_FACTORY
OLDNEW
« no previous file with comments | « webrtc/media/base/fakevideocapturer.h ('k') | webrtc/media/base/videocapturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698