| 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 if (!default_socket_factory_) { | 165 if (!default_socket_factory_) { |
| 166 return false; | 166 return false; |
| 167 } | 167 } |
| 168 | 168 |
| 169 // TODO: Need to make sure only one VoE is created inside | 169 // TODO: Need to make sure only one VoE is created inside |
| 170 // WebRtcMediaEngine. | 170 // WebRtcMediaEngine. |
| 171 cricket::MediaEngineInterface* media_engine = | 171 cricket::MediaEngineInterface* media_engine = |
| 172 worker_thread_->Invoke<cricket::MediaEngineInterface*>(rtc::Bind( | 172 worker_thread_->Invoke<cricket::MediaEngineInterface*>(rtc::Bind( |
| 173 &PeerConnectionFactory::CreateMediaEngine_w, this)); | 173 &PeerConnectionFactory::CreateMediaEngine_w, this)); |
| 174 | 174 |
| 175 channel_manager_.reset( | 175 rtc::Thread* const network_thread = worker_thread_; |
| 176 new cricket::ChannelManager(media_engine, worker_thread_)); | 176 channel_manager_.reset(new cricket::ChannelManager( |
| 177 media_engine, worker_thread_, network_thread)); |
| 177 | 178 |
| 178 channel_manager_->SetVideoRtxEnabled(true); | 179 channel_manager_->SetVideoRtxEnabled(true); |
| 179 if (!channel_manager_->Init()) { | 180 if (!channel_manager_->Init()) { |
| 180 return false; | 181 return false; |
| 181 } | 182 } |
| 182 | 183 |
| 183 dtls_identity_store_ = new RefCountedDtlsIdentityStore( | 184 dtls_identity_store_ = new RefCountedDtlsIdentityStore( |
| 184 signaling_thread_, worker_thread_); | 185 signaling_thread_, worker_thread_); |
| 185 | 186 |
| 186 return true; | 187 return true; |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 } | 338 } |
| 338 | 339 |
| 339 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 340 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { |
| 340 ASSERT(worker_thread_ == rtc::Thread::Current()); | 341 ASSERT(worker_thread_ == rtc::Thread::Current()); |
| 341 return cricket::WebRtcMediaEngineFactory::Create( | 342 return cricket::WebRtcMediaEngineFactory::Create( |
| 342 default_adm_.get(), video_encoder_factory_.get(), | 343 default_adm_.get(), video_encoder_factory_.get(), |
| 343 video_decoder_factory_.get()); | 344 video_decoder_factory_.get()); |
| 344 } | 345 } |
| 345 | 346 |
| 346 } // namespace webrtc | 347 } // namespace webrtc |
| OLD | NEW |