| 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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 return channel_manager_.get(); | 367 return channel_manager_.get(); |
| 368 } | 368 } |
| 369 | 369 |
| 370 rtc::Thread* PeerConnectionFactory::signaling_thread() { | 370 rtc::Thread* PeerConnectionFactory::signaling_thread() { |
| 371 // This method can be called on a different thread when the factory is | 371 // This method can be called on a different thread when the factory is |
| 372 // created in CreatePeerConnectionFactory(). | 372 // created in CreatePeerConnectionFactory(). |
| 373 return signaling_thread_; | 373 return signaling_thread_; |
| 374 } | 374 } |
| 375 | 375 |
| 376 rtc::Thread* PeerConnectionFactory::worker_thread() { | 376 rtc::Thread* PeerConnectionFactory::worker_thread() { |
| 377 RTC_DCHECK(signaling_thread_->IsCurrent()); | |
| 378 return worker_thread_; | 377 return worker_thread_; |
| 379 } | 378 } |
| 380 | 379 |
| 381 rtc::Thread* PeerConnectionFactory::network_thread() { | 380 rtc::Thread* PeerConnectionFactory::network_thread() { |
| 382 return network_thread_; | 381 return network_thread_; |
| 383 } | 382 } |
| 384 | 383 |
| 385 std::unique_ptr<cricket::MediaEngineInterface> | 384 std::unique_ptr<cricket::MediaEngineInterface> |
| 386 PeerConnectionFactory::CreateMediaEngine_w() { | 385 PeerConnectionFactory::CreateMediaEngine_w() { |
| 387 RTC_DCHECK(worker_thread_ == rtc::Thread::Current()); | 386 RTC_DCHECK(worker_thread_ == rtc::Thread::Current()); |
| 388 return std::unique_ptr<cricket::MediaEngineInterface>( | 387 return std::unique_ptr<cricket::MediaEngineInterface>( |
| 389 cricket::WebRtcMediaEngineFactory::Create( | 388 cricket::WebRtcMediaEngineFactory::Create( |
| 390 default_adm_.get(), audio_encoder_factory_, | 389 default_adm_.get(), audio_encoder_factory_, |
| 391 audio_decoder_factory_, | 390 audio_decoder_factory_, |
| 392 video_encoder_factory_.get(), video_decoder_factory_.get(), | 391 video_encoder_factory_.get(), video_decoder_factory_.get(), |
| 393 external_audio_mixer_)); | 392 external_audio_mixer_)); |
| 394 } | 393 } |
| 395 | 394 |
| 396 } // namespace webrtc | 395 } // namespace webrtc |
| OLD | NEW |