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

Side by Side Diff: webrtc/config.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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 #include "webrtc/config.h" 10 #include "webrtc/config.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 ss << "{content_type: "; 134 ss << "{content_type: ";
135 switch (content_type) { 135 switch (content_type) {
136 case ContentType::kRealtimeVideo: 136 case ContentType::kRealtimeVideo:
137 ss << "kRealtimeVideo"; 137 ss << "kRealtimeVideo";
138 break; 138 break;
139 case ContentType::kScreen: 139 case ContentType::kScreen:
140 ss << "kScreenshare"; 140 ss << "kScreenshare";
141 break; 141 break;
142 } 142 }
143 ss << ", encoder_specific_settings: "; 143 ss << ", encoder_specific_settings: ";
144 ss << (encoder_specific_settings != NULL ? "(ptr)" : "NULL"); 144 ss << (encoder_specific_settings != nullptr ? "(ptr)" : "null");
145 145
146 ss << ", min_transmit_bitrate_bps: " << min_transmit_bitrate_bps; 146 ss << ", min_transmit_bitrate_bps: " << min_transmit_bitrate_bps;
147 ss << '}'; 147 ss << '}';
148 return ss.str(); 148 return ss.str();
149 } 149 }
150 150
151 VideoEncoderConfig::VideoEncoderConfig(const VideoEncoderConfig&) = default; 151 VideoEncoderConfig::VideoEncoderConfig(const VideoEncoderConfig&) = default;
152 152
153 void VideoEncoderConfig::EncoderSpecificSettings::FillEncoderSpecificSettings( 153 void VideoEncoderConfig::EncoderSpecificSettings::FillEncoderSpecificSettings(
154 VideoCodec* codec) const { 154 VideoCodec* codec) const {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 VideoEncoderConfig::Vp9EncoderSpecificSettings::Vp9EncoderSpecificSettings( 199 VideoEncoderConfig::Vp9EncoderSpecificSettings::Vp9EncoderSpecificSettings(
200 const VideoCodecVP9& specifics) 200 const VideoCodecVP9& specifics)
201 : specifics_(specifics) {} 201 : specifics_(specifics) {}
202 202
203 void VideoEncoderConfig::Vp9EncoderSpecificSettings::FillVideoCodecVp9( 203 void VideoEncoderConfig::Vp9EncoderSpecificSettings::FillVideoCodecVp9(
204 VideoCodecVP9* vp9_settings) const { 204 VideoCodecVP9* vp9_settings) const {
205 *vp9_settings = specifics_; 205 *vp9_settings = specifics_;
206 } 206 }
207 207
208 } // namespace webrtc 208 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698