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

Side by Side Diff: webrtc/video/video_send_stream.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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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/video/video_send_stream.h" 10 #include "webrtc/video/video_send_stream.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 Clock::GetRealTimeClock())); 133 Clock::GetRealTimeClock()));
134 } 134 }
135 135
136 } // namespace 136 } // namespace
137 137
138 std::string 138 std::string
139 VideoSendStream::Config::EncoderSettings::ToString() const { 139 VideoSendStream::Config::EncoderSettings::ToString() const {
140 std::stringstream ss; 140 std::stringstream ss;
141 ss << "{payload_name: " << payload_name; 141 ss << "{payload_name: " << payload_name;
142 ss << ", payload_type: " << payload_type; 142 ss << ", payload_type: " << payload_type;
143 ss << ", encoder: " << (encoder ? "(VideoEncoder)" : "nullptr"); 143 ss << ", encoder: " << (encoder ? "(VideoEncoder)" : "null");
144 ss << '}'; 144 ss << '}';
145 return ss.str(); 145 return ss.str();
146 } 146 }
147 147
148 std::string VideoSendStream::Config::Rtp::Rtx::ToString() 148 std::string VideoSendStream::Config::Rtp::Rtx::ToString()
149 const { 149 const {
150 std::stringstream ss; 150 std::stringstream ss;
151 ss << "{ssrcs: ["; 151 ss << "{ssrcs: [";
152 for (size_t i = 0; i < ssrcs.size(); ++i) { 152 for (size_t i = 0; i < ssrcs.size(); ++i) {
153 ss << ssrcs[i]; 153 ss << ssrcs[i];
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 ss << ", c_name: " << c_name; 199 ss << ", c_name: " << c_name;
200 ss << '}'; 200 ss << '}';
201 return ss.str(); 201 return ss.str();
202 } 202 }
203 203
204 std::string VideoSendStream::Config::ToString() const { 204 std::string VideoSendStream::Config::ToString() const {
205 std::stringstream ss; 205 std::stringstream ss;
206 ss << "{encoder_settings: " << encoder_settings.ToString(); 206 ss << "{encoder_settings: " << encoder_settings.ToString();
207 ss << ", rtp: " << rtp.ToString(); 207 ss << ", rtp: " << rtp.ToString();
208 ss << ", pre_encode_callback: " 208 ss << ", pre_encode_callback: "
209 << (pre_encode_callback ? "(VideoSinkInterface)" : "nullptr"); 209 << (pre_encode_callback ? "(VideoSinkInterface)" : "null");
210 ss << ", post_encode_callback: " 210 ss << ", post_encode_callback: "
211 << (post_encode_callback ? "(EncodedFrameObserver)" : "nullptr"); 211 << (post_encode_callback ? "(EncodedFrameObserver)" : "null");
212 ss << ", render_delay_ms: " << render_delay_ms; 212 ss << ", render_delay_ms: " << render_delay_ms;
213 ss << ", target_delay_ms: " << target_delay_ms; 213 ss << ", target_delay_ms: " << target_delay_ms;
214 ss << ", suspend_below_min_bitrate: " << (suspend_below_min_bitrate ? "on" 214 ss << ", suspend_below_min_bitrate: " << (suspend_below_min_bitrate ? "on"
215 : "off"); 215 : "off");
216 ss << '}'; 216 ss << '}';
217 return ss.str(); 217 return ss.str();
218 } 218 }
219 219
220 std::string VideoSendStream::Stats::ToString(int64_t time_ms) const { 220 std::string VideoSendStream::Stats::ToString(int64_t time_ms) const {
221 std::stringstream ss; 221 std::stringstream ss;
(...skipping 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after
1335 std::min(config_->rtp.max_packet_size, 1335 std::min(config_->rtp.max_packet_size,
1336 kPathMTU - transport_overhead_bytes_per_packet_); 1336 kPathMTU - transport_overhead_bytes_per_packet_);
1337 1337
1338 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) { 1338 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
1339 rtp_rtcp->SetMaxRtpPacketSize(rtp_packet_size); 1339 rtp_rtcp->SetMaxRtpPacketSize(rtp_packet_size);
1340 } 1340 }
1341 } 1341 }
1342 1342
1343 } // namespace internal 1343 } // namespace internal
1344 } // namespace webrtc 1344 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698