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 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 RTC_DCHECK(signaling_thread_->IsCurrent()); | 335 RTC_DCHECK(signaling_thread_->IsCurrent()); |
336 return MediaStreamProxy::Create(signaling_thread_, | 336 return MediaStreamProxy::Create(signaling_thread_, |
337 MediaStream::Create(label)); | 337 MediaStream::Create(label)); |
338 } | 338 } |
339 | 339 |
340 rtc::scoped_refptr<VideoTrackInterface> PeerConnectionFactory::CreateVideoTrack( | 340 rtc::scoped_refptr<VideoTrackInterface> PeerConnectionFactory::CreateVideoTrack( |
341 const std::string& id, | 341 const std::string& id, |
342 VideoTrackSourceInterface* source) { | 342 VideoTrackSourceInterface* source) { |
343 RTC_DCHECK(signaling_thread_->IsCurrent()); | 343 RTC_DCHECK(signaling_thread_->IsCurrent()); |
344 rtc::scoped_refptr<VideoTrackInterface> track( | 344 rtc::scoped_refptr<VideoTrackInterface> track( |
345 VideoTrack::Create(id, source)); | 345 VideoTrack::Create(id, source, worker_thread_)); |
346 return VideoTrackProxy::Create(signaling_thread_, worker_thread_, track); | 346 return VideoTrackProxy::Create(signaling_thread_, worker_thread_, track); |
347 } | 347 } |
348 | 348 |
349 rtc::scoped_refptr<AudioTrackInterface> | 349 rtc::scoped_refptr<AudioTrackInterface> |
350 PeerConnectionFactory::CreateAudioTrack(const std::string& id, | 350 PeerConnectionFactory::CreateAudioTrack(const std::string& id, |
351 AudioSourceInterface* source) { | 351 AudioSourceInterface* source) { |
352 RTC_DCHECK(signaling_thread_->IsCurrent()); | 352 RTC_DCHECK(signaling_thread_->IsCurrent()); |
353 rtc::scoped_refptr<AudioTrackInterface> track(AudioTrack::Create(id, source)); | 353 rtc::scoped_refptr<AudioTrackInterface> track(AudioTrack::Create(id, source)); |
354 return AudioTrackProxy::Create(signaling_thread_, track); | 354 return AudioTrackProxy::Create(signaling_thread_, track); |
355 } | 355 } |
(...skipping 30 matching lines...) Expand all Loading... |
386 RTC_DCHECK(worker_thread_ == rtc::Thread::Current()); | 386 RTC_DCHECK(worker_thread_ == rtc::Thread::Current()); |
387 return std::unique_ptr<cricket::MediaEngineInterface>( | 387 return std::unique_ptr<cricket::MediaEngineInterface>( |
388 cricket::WebRtcMediaEngineFactory::Create( | 388 cricket::WebRtcMediaEngineFactory::Create( |
389 default_adm_.get(), audio_encoder_factory_, | 389 default_adm_.get(), audio_encoder_factory_, |
390 audio_decoder_factory_, | 390 audio_decoder_factory_, |
391 video_encoder_factory_.get(), video_decoder_factory_.get(), | 391 video_encoder_factory_.get(), video_decoder_factory_.get(), |
392 external_audio_mixer_)); | 392 external_audio_mixer_)); |
393 } | 393 } |
394 | 394 |
395 } // namespace webrtc | 395 } // namespace webrtc |
OLD | NEW |