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

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

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 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
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 namespace cricket { 19 namespace cricket {
20 20
21 MediaEngineFactory::MediaEngineCreateFunction 21 MediaEngineFactory::MediaEngineCreateFunction
22 MediaEngineFactory::create_function_ = NULL; 22 MediaEngineFactory::create_function_ = nullptr;
23 23
24 MediaEngineFactory::MediaEngineCreateFunction 24 MediaEngineFactory::MediaEngineCreateFunction
25 MediaEngineFactory::SetCreateFunction(MediaEngineCreateFunction function) { 25 MediaEngineFactory::SetCreateFunction(MediaEngineCreateFunction function) {
26 MediaEngineCreateFunction old_function = create_function_; 26 MediaEngineCreateFunction old_function = create_function_;
27 create_function_ = function; 27 create_function_ = function;
28 return old_function; 28 return old_function;
29 } 29 }
30 30
31 }; // namespace cricket 31 }; // namespace cricket
32 32
33 #endif // DISABLE_MEDIA_ENGINE_FACTORY 33 #endif // DISABLE_MEDIA_ENGINE_FACTORY
34 34
35 namespace cricket { 35 namespace cricket {
36 36
37 webrtc::RtpParameters CreateRtpParametersWithOneEncoding() { 37 webrtc::RtpParameters CreateRtpParametersWithOneEncoding() {
38 webrtc::RtpParameters parameters; 38 webrtc::RtpParameters parameters;
39 webrtc::RtpEncodingParameters encoding; 39 webrtc::RtpEncodingParameters encoding;
40 parameters.encodings.push_back(encoding); 40 parameters.encodings.push_back(encoding);
41 return parameters; 41 return parameters;
42 } 42 }
43 43
44 }; // namespace cricket 44 }; // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698