| OLD | NEW |
| 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 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 return AudioTrackProxy::Create(signaling_thread_, track); | 304 return AudioTrackProxy::Create(signaling_thread_, track); |
| 305 } | 305 } |
| 306 | 306 |
| 307 webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController( | 307 webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController( |
| 308 const cricket::MediaConfig& config) const { | 308 const cricket::MediaConfig& config) const { |
| 309 RTC_DCHECK(signaling_thread_->IsCurrent()); | 309 RTC_DCHECK(signaling_thread_->IsCurrent()); |
| 310 return MediaControllerInterface::Create(config, worker_thread_, | 310 return MediaControllerInterface::Create(config, worker_thread_, |
| 311 channel_manager_.get()); | 311 channel_manager_.get()); |
| 312 } | 312 } |
| 313 | 313 |
| 314 cricket::TransportController* PeerConnectionFactory::CreateTransportController( |
| 315 cricket::PortAllocator* port_allocator) { |
| 316 RTC_DCHECK(signaling_thread_->IsCurrent()); |
| 317 return new cricket::TransportController(signaling_thread_, network_thread_, |
| 318 port_allocator); |
| 319 } |
| 320 |
| 314 rtc::Thread* PeerConnectionFactory::signaling_thread() { | 321 rtc::Thread* PeerConnectionFactory::signaling_thread() { |
| 315 // This method can be called on a different thread when the factory is | 322 // This method can be called on a different thread when the factory is |
| 316 // created in CreatePeerConnectionFactory(). | 323 // created in CreatePeerConnectionFactory(). |
| 317 return signaling_thread_; | 324 return signaling_thread_; |
| 318 } | 325 } |
| 319 | 326 |
| 320 rtc::Thread* PeerConnectionFactory::worker_thread() { | 327 rtc::Thread* PeerConnectionFactory::worker_thread() { |
| 321 RTC_DCHECK(signaling_thread_->IsCurrent()); | 328 RTC_DCHECK(signaling_thread_->IsCurrent()); |
| 322 return worker_thread_; | 329 return worker_thread_; |
| 323 } | 330 } |
| 324 | 331 |
| 325 rtc::Thread* PeerConnectionFactory::network_thread() { | 332 rtc::Thread* PeerConnectionFactory::network_thread() { |
| 326 return network_thread_; | 333 return network_thread_; |
| 327 } | 334 } |
| 328 | 335 |
| 329 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 336 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { |
| 330 ASSERT(worker_thread_ == rtc::Thread::Current()); | 337 ASSERT(worker_thread_ == rtc::Thread::Current()); |
| 331 return cricket::WebRtcMediaEngineFactory::Create( | 338 return cricket::WebRtcMediaEngineFactory::Create( |
| 332 default_adm_.get(), | 339 default_adm_.get(), |
| 333 audio_decoder_factory_, | 340 audio_decoder_factory_, |
| 334 video_encoder_factory_.get(), | 341 video_encoder_factory_.get(), |
| 335 video_decoder_factory_.get()); | 342 video_decoder_factory_.get()); |
| 336 } | 343 } |
| 337 | 344 |
| 338 } // namespace webrtc | 345 } // namespace webrtc |
| OLD | NEW |