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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 | 146 |
147 if (owns_ptrs_) { | 147 if (owns_ptrs_) { |
148 if (wraps_current_thread_) | 148 if (wraps_current_thread_) |
149 rtc::ThreadManager::Instance()->UnwrapCurrentThread(); | 149 rtc::ThreadManager::Instance()->UnwrapCurrentThread(); |
150 delete worker_thread_; | 150 delete worker_thread_; |
151 } | 151 } |
152 } | 152 } |
153 | 153 |
154 bool PeerConnectionFactory::Initialize() { | 154 bool PeerConnectionFactory::Initialize() { |
155 RTC_DCHECK(signaling_thread_->IsCurrent()); | 155 RTC_DCHECK(signaling_thread_->IsCurrent()); |
156 rtc::InitRandom(rtc::Time()); | 156 rtc::InitRandom(rtc::Time32()); |
157 | 157 |
158 default_network_manager_.reset(new rtc::BasicNetworkManager()); | 158 default_network_manager_.reset(new rtc::BasicNetworkManager()); |
159 if (!default_network_manager_) { | 159 if (!default_network_manager_) { |
160 return false; | 160 return false; |
161 } | 161 } |
162 | 162 |
163 default_socket_factory_.reset( | 163 default_socket_factory_.reset( |
164 new rtc::BasicPacketSocketFactory(worker_thread_)); | 164 new rtc::BasicPacketSocketFactory(worker_thread_)); |
165 if (!default_socket_factory_) { | 165 if (!default_socket_factory_) { |
166 return false; | 166 return false; |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 } | 351 } |
352 | 352 |
353 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 353 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { |
354 ASSERT(worker_thread_ == rtc::Thread::Current()); | 354 ASSERT(worker_thread_ == rtc::Thread::Current()); |
355 return cricket::WebRtcMediaEngineFactory::Create( | 355 return cricket::WebRtcMediaEngineFactory::Create( |
356 default_adm_.get(), video_encoder_factory_.get(), | 356 default_adm_.get(), video_encoder_factory_.get(), |
357 video_decoder_factory_.get()); | 357 video_decoder_factory_.get()); |
358 } | 358 } |
359 | 359 |
360 } // namespace webrtc | 360 } // namespace webrtc |
OLD | NEW |