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

Side by Side Diff: webrtc/pc/peerconnectionfactory.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 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 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
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 default_adm_(default_adm), 166 default_adm_(default_adm),
167 // TODO(ossu): Take care of audio_encoder_factory (see bug 5806). 167 // TODO(ossu): Take care of audio_encoder_factory (see bug 5806).
168 audio_decoder_factory_(audio_decoder_factory), 168 audio_decoder_factory_(audio_decoder_factory),
169 video_encoder_factory_(video_encoder_factory), 169 video_encoder_factory_(video_encoder_factory),
170 video_decoder_factory_(video_decoder_factory), 170 video_decoder_factory_(video_decoder_factory),
171 external_audio_mixer_(audio_mixer) { 171 external_audio_mixer_(audio_mixer) {
172 RTC_DCHECK(network_thread); 172 RTC_DCHECK(network_thread);
173 RTC_DCHECK(worker_thread); 173 RTC_DCHECK(worker_thread);
174 RTC_DCHECK(signaling_thread); 174 RTC_DCHECK(signaling_thread);
175 // TODO: Currently there is no way creating an external adm in 175 // TODO: Currently there is no way creating an external adm in
176 // libjingle source tree. So we can 't currently assert if this is NULL. 176 // libjingle source tree. So we can 't currently assert if this is null.
177 // RTC_DCHECK(default_adm != NULL); 177 // RTC_DCHECK(default_adm != null);
178 } 178 }
179 179
180 PeerConnectionFactory::~PeerConnectionFactory() { 180 PeerConnectionFactory::~PeerConnectionFactory() {
181 RTC_DCHECK(signaling_thread_->IsCurrent()); 181 RTC_DCHECK(signaling_thread_->IsCurrent());
182 channel_manager_.reset(nullptr); 182 channel_manager_.reset(nullptr);
183 183
184 // Make sure |worker_thread_| and |signaling_thread_| outlive 184 // Make sure |worker_thread_| and |signaling_thread_| outlive
185 // |default_socket_factory_| and |default_network_manager_|. 185 // |default_socket_factory_| and |default_network_manager_|.
186 default_socket_factory_ = nullptr; 186 default_socket_factory_ = nullptr;
187 default_network_manager_ = nullptr; 187 default_network_manager_ = nullptr;
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 } 390 }
391 391
392 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 392 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
393 RTC_DCHECK(worker_thread_ == rtc::Thread::Current()); 393 RTC_DCHECK(worker_thread_ == rtc::Thread::Current());
394 return cricket::WebRtcMediaEngineFactory::Create( 394 return cricket::WebRtcMediaEngineFactory::Create(
395 default_adm_.get(), audio_decoder_factory_, video_encoder_factory_.get(), 395 default_adm_.get(), audio_decoder_factory_, video_encoder_factory_.get(),
396 video_decoder_factory_.get(), external_audio_mixer_); 396 video_decoder_factory_.get(), external_audio_mixer_);
397 } 397 }
398 398
399 } // namespace webrtc 399 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698