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

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

Issue 1820023004: Remove all uses of the HAVE_CONFIG_H define. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 8 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/libjingle/xmpp/xmppsocket.cc ('k') | webrtc/media/engine/webrtcvideocapturer.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/engine/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
20 #include "config.h"
21 #endif // HAVE_CONFIG
22
23 namespace cricket { 19 namespace cricket {
24 20
25 MediaEngineFactory::MediaEngineCreateFunction 21 MediaEngineFactory::MediaEngineCreateFunction
26 MediaEngineFactory::create_function_ = NULL; 22 MediaEngineFactory::create_function_ = NULL;
27 23
28 MediaEngineFactory::MediaEngineCreateFunction 24 MediaEngineFactory::MediaEngineCreateFunction
29 MediaEngineFactory::SetCreateFunction(MediaEngineCreateFunction function) { 25 MediaEngineFactory::SetCreateFunction(MediaEngineCreateFunction function) {
30 MediaEngineCreateFunction old_function = create_function_; 26 MediaEngineCreateFunction old_function = create_function_;
31 create_function_ = function; 27 create_function_ = function;
32 return old_function; 28 return old_function;
33 } 29 }
34 30
35 }; // namespace cricket 31 }; // namespace cricket
36 32
37 #endif // DISABLE_MEDIA_ENGINE_FACTORY 33 #endif // DISABLE_MEDIA_ENGINE_FACTORY
38 34
39 namespace cricket { 35 namespace cricket {
40 36
41 webrtc::RtpParameters CreateRtpParametersWithOneEncoding() { 37 webrtc::RtpParameters CreateRtpParametersWithOneEncoding() {
42 webrtc::RtpParameters parameters; 38 webrtc::RtpParameters parameters;
43 webrtc::RtpEncodingParameters encoding; 39 webrtc::RtpEncodingParameters encoding;
44 parameters.encodings.push_back(encoding); 40 parameters.encodings.push_back(encoding);
45 return parameters; 41 return parameters;
46 } 42 }
47 43
48 }; // namespace cricket 44 }; // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/libjingle/xmpp/xmppsocket.cc ('k') | webrtc/media/engine/webrtcvideocapturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698