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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
157 // WebRtcMediaEngine. | 157 // WebRtcMediaEngine. |
158 cricket::MediaEngineInterface* media_engine = | 158 cricket::MediaEngineInterface* media_engine = |
159 worker_thread_->Invoke<cricket::MediaEngineInterface*>( | 159 worker_thread_->Invoke<cricket::MediaEngineInterface*>( |
160 RTC_FROM_HERE, | 160 RTC_FROM_HERE, |
161 rtc::Bind(&PeerConnectionFactory::CreateMediaEngine_w, this)); | 161 rtc::Bind(&PeerConnectionFactory::CreateMediaEngine_w, this)); |
162 | 162 |
163 channel_manager_.reset(new cricket::ChannelManager( | 163 channel_manager_.reset(new cricket::ChannelManager( |
164 media_engine, worker_thread_, network_thread_)); | 164 media_engine, worker_thread_, network_thread_)); |
165 | 165 |
166 channel_manager_->SetVideoRtxEnabled(true); | 166 channel_manager_->SetVideoRtxEnabled(true); |
| 167 channel_manager_->SetCryptoOptions(options_.crypto_options); |
167 if (!channel_manager_->Init()) { | 168 if (!channel_manager_->Init()) { |
168 return false; | 169 return false; |
169 } | 170 } |
170 | 171 |
171 return true; | 172 return true; |
172 } | 173 } |
173 | 174 |
| 175 void PeerConnectionFactory::SetOptions(const Options& options) { |
| 176 options_ = options; |
| 177 if (channel_manager_) { |
| 178 channel_manager_->SetCryptoOptions(options.crypto_options); |
| 179 } |
| 180 } |
| 181 |
174 rtc::scoped_refptr<AudioSourceInterface> | 182 rtc::scoped_refptr<AudioSourceInterface> |
175 PeerConnectionFactory::CreateAudioSource( | 183 PeerConnectionFactory::CreateAudioSource( |
176 const MediaConstraintsInterface* constraints) { | 184 const MediaConstraintsInterface* constraints) { |
177 RTC_DCHECK(signaling_thread_->IsCurrent()); | 185 RTC_DCHECK(signaling_thread_->IsCurrent()); |
178 rtc::scoped_refptr<LocalAudioSource> source( | 186 rtc::scoped_refptr<LocalAudioSource> source( |
179 LocalAudioSource::Create(options_, constraints)); | 187 LocalAudioSource::Create(options_, constraints)); |
180 return source; | 188 return source; |
181 } | 189 } |
182 | 190 |
183 rtc::scoped_refptr<AudioSourceInterface> | 191 rtc::scoped_refptr<AudioSourceInterface> |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 326 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { |
319 ASSERT(worker_thread_ == rtc::Thread::Current()); | 327 ASSERT(worker_thread_ == rtc::Thread::Current()); |
320 return cricket::WebRtcMediaEngineFactory::Create( | 328 return cricket::WebRtcMediaEngineFactory::Create( |
321 default_adm_.get(), | 329 default_adm_.get(), |
322 audio_decoder_factory_, | 330 audio_decoder_factory_, |
323 video_encoder_factory_.get(), | 331 video_encoder_factory_.get(), |
324 video_decoder_factory_.get()); | 332 video_decoder_factory_.get()); |
325 } | 333 } |
326 | 334 |
327 } // namespace webrtc | 335 } // namespace webrtc |
OLD | NEW |