| 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 if (channel_manager_) { | 233 if (channel_manager_) { |
| 234 channel_manager_->SetCryptoOptions(options.crypto_options); | 234 channel_manager_->SetCryptoOptions(options.crypto_options); |
| 235 } | 235 } |
| 236 } | 236 } |
| 237 | 237 |
| 238 rtc::scoped_refptr<AudioSourceInterface> | 238 rtc::scoped_refptr<AudioSourceInterface> |
| 239 PeerConnectionFactory::CreateAudioSource( | 239 PeerConnectionFactory::CreateAudioSource( |
| 240 const MediaConstraintsInterface* constraints) { | 240 const MediaConstraintsInterface* constraints) { |
| 241 RTC_DCHECK(signaling_thread_->IsCurrent()); | 241 RTC_DCHECK(signaling_thread_->IsCurrent()); |
| 242 rtc::scoped_refptr<LocalAudioSource> source( | 242 rtc::scoped_refptr<LocalAudioSource> source( |
| 243 LocalAudioSource::Create(options_, constraints)); | 243 LocalAudioSource::Create(constraints)); |
| 244 return source; | 244 return source; |
| 245 } | 245 } |
| 246 | 246 |
| 247 rtc::scoped_refptr<AudioSourceInterface> | 247 rtc::scoped_refptr<AudioSourceInterface> |
| 248 PeerConnectionFactory::CreateAudioSource(const cricket::AudioOptions& options) { | 248 PeerConnectionFactory::CreateAudioSource(const cricket::AudioOptions& options) { |
| 249 RTC_DCHECK(signaling_thread_->IsCurrent()); | 249 RTC_DCHECK(signaling_thread_->IsCurrent()); |
| 250 rtc::scoped_refptr<LocalAudioSource> source( | 250 rtc::scoped_refptr<LocalAudioSource> source( |
| 251 LocalAudioSource::Create(options_, &options)); | 251 LocalAudioSource::Create(&options)); |
| 252 return source; | 252 return source; |
| 253 } | 253 } |
| 254 | 254 |
| 255 rtc::scoped_refptr<VideoTrackSourceInterface> | 255 rtc::scoped_refptr<VideoTrackSourceInterface> |
| 256 PeerConnectionFactory::CreateVideoSource( | 256 PeerConnectionFactory::CreateVideoSource( |
| 257 std::unique_ptr<cricket::VideoCapturer> capturer, | 257 std::unique_ptr<cricket::VideoCapturer> capturer, |
| 258 const MediaConstraintsInterface* constraints) { | 258 const MediaConstraintsInterface* constraints) { |
| 259 RTC_DCHECK(signaling_thread_->IsCurrent()); | 259 RTC_DCHECK(signaling_thread_->IsCurrent()); |
| 260 rtc::scoped_refptr<VideoTrackSourceInterface> source( | 260 rtc::scoped_refptr<VideoTrackSourceInterface> source( |
| 261 VideoCapturerTrackSource::Create(worker_thread_, std::move(capturer), | 261 VideoCapturerTrackSource::Create(worker_thread_, std::move(capturer), |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 PeerConnectionFactory::CreateMediaEngine_w() { | 395 PeerConnectionFactory::CreateMediaEngine_w() { |
| 396 RTC_DCHECK(worker_thread_ == rtc::Thread::Current()); | 396 RTC_DCHECK(worker_thread_ == rtc::Thread::Current()); |
| 397 return std::unique_ptr<cricket::MediaEngineInterface>( | 397 return std::unique_ptr<cricket::MediaEngineInterface>( |
| 398 cricket::WebRtcMediaEngineFactory::Create( | 398 cricket::WebRtcMediaEngineFactory::Create( |
| 399 default_adm_.get(), audio_decoder_factory_, | 399 default_adm_.get(), audio_decoder_factory_, |
| 400 video_encoder_factory_.get(), video_decoder_factory_.get(), | 400 video_encoder_factory_.get(), video_decoder_factory_.get(), |
| 401 external_audio_mixer_)); | 401 external_audio_mixer_)); |
| 402 } | 402 } |
| 403 | 403 |
| 404 } // namespace webrtc | 404 } // namespace webrtc |
| OLD | NEW |