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

Side by Side Diff: webrtc/api/peerconnectionfactory.cc

Issue 1975453002: Add PeerConnection IsClosed check. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Minor Changes. Created 4 years, 6 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 channel_manager_.reset(new cricket::ChannelManager( 152 channel_manager_.reset(new cricket::ChannelManager(
153 media_engine, worker_thread_, network_thread_)); 153 media_engine, worker_thread_, network_thread_));
154 154
155 channel_manager_->SetVideoRtxEnabled(true); 155 channel_manager_->SetVideoRtxEnabled(true);
156 if (!channel_manager_->Init()) { 156 if (!channel_manager_->Init()) {
157 return false; 157 return false;
158 } 158 }
159 159
160 return true; 160 return true;
161 } 161 }
162
Taylor Brandstetter 2016/06/21 23:50:02 Was this line deleted on purpose?
163 rtc::scoped_refptr<AudioSourceInterface> 162 rtc::scoped_refptr<AudioSourceInterface>
164 PeerConnectionFactory::CreateAudioSource( 163 PeerConnectionFactory::CreateAudioSource(
165 const MediaConstraintsInterface* constraints) { 164 const MediaConstraintsInterface* constraints) {
166 RTC_DCHECK(signaling_thread_->IsCurrent()); 165 RTC_DCHECK(signaling_thread_->IsCurrent());
167 rtc::scoped_refptr<LocalAudioSource> source( 166 rtc::scoped_refptr<LocalAudioSource> source(
168 LocalAudioSource::Create(options_, constraints)); 167 LocalAudioSource::Create(options_, constraints));
169 return source; 168 return source;
170 } 169 }
171 170
172 rtc::scoped_refptr<AudioSourceInterface> 171 rtc::scoped_refptr<AudioSourceInterface>
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 return AudioTrackProxy::Create(signaling_thread_, track); 292 return AudioTrackProxy::Create(signaling_thread_, track);
294 } 293 }
295 294
296 webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController( 295 webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController(
297 const cricket::MediaConfig& config) const { 296 const cricket::MediaConfig& config) const {
298 RTC_DCHECK(signaling_thread_->IsCurrent()); 297 RTC_DCHECK(signaling_thread_->IsCurrent());
299 return MediaControllerInterface::Create(config, worker_thread_, 298 return MediaControllerInterface::Create(config, worker_thread_,
300 channel_manager_.get()); 299 channel_manager_.get());
301 } 300 }
302 301
302 cricket::TransportController* PeerConnectionFactory::CreateTransportController(
303 cricket::PortAllocator* port_allocator) {
304 RTC_DCHECK(signaling_thread_->IsCurrent());
305 return new cricket::TransportController(signaling_thread_, network_thread_,
306 port_allocator);
307 }
308
303 rtc::Thread* PeerConnectionFactory::signaling_thread() { 309 rtc::Thread* PeerConnectionFactory::signaling_thread() {
304 // This method can be called on a different thread when the factory is 310 // This method can be called on a different thread when the factory is
305 // created in CreatePeerConnectionFactory(). 311 // created in CreatePeerConnectionFactory().
306 return signaling_thread_; 312 return signaling_thread_;
307 } 313 }
308 314
309 rtc::Thread* PeerConnectionFactory::worker_thread() { 315 rtc::Thread* PeerConnectionFactory::worker_thread() {
310 RTC_DCHECK(signaling_thread_->IsCurrent()); 316 RTC_DCHECK(signaling_thread_->IsCurrent());
311 return worker_thread_; 317 return worker_thread_;
312 } 318 }
313 319
314 rtc::Thread* PeerConnectionFactory::network_thread() { 320 rtc::Thread* PeerConnectionFactory::network_thread() {
315 return network_thread_; 321 return network_thread_;
316 } 322 }
317 323
318 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 324 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
319 ASSERT(worker_thread_ == rtc::Thread::Current()); 325 ASSERT(worker_thread_ == rtc::Thread::Current());
320 return cricket::WebRtcMediaEngineFactory::Create( 326 return cricket::WebRtcMediaEngineFactory::Create(
321 default_adm_.get(), video_encoder_factory_.get(), 327 default_adm_.get(), video_encoder_factory_.get(),
322 video_decoder_factory_.get()); 328 video_decoder_factory_.get());
323 } 329 }
324 330
325 } // namespace webrtc 331 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698