OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2017 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2017 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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
472 VideoCapturerTrackSource::Create( | 472 VideoCapturerTrackSource::Create( |
473 worker_thread_.get(), std::move(capturer), constraints, false)); | 473 worker_thread_.get(), std::move(capturer), constraints, false)); |
474 return VideoTrackSourceProxy::Create(signaling_thread_, worker_thread_.get(), | 474 return VideoTrackSourceProxy::Create(signaling_thread_, worker_thread_.get(), |
475 source); | 475 source); |
476 } | 476 } |
477 | 477 |
478 rtc::scoped_refptr<VideoTrackInterface> OrtcFactory::CreateVideoTrack( | 478 rtc::scoped_refptr<VideoTrackInterface> OrtcFactory::CreateVideoTrack( |
479 const std::string& id, | 479 const std::string& id, |
480 VideoTrackSourceInterface* source) { | 480 VideoTrackSourceInterface* source) { |
481 RTC_DCHECK_RUN_ON(signaling_thread_); | 481 RTC_DCHECK_RUN_ON(signaling_thread_); |
482 rtc::scoped_refptr<VideoTrackInterface> track(VideoTrack::Create(id, source)); | 482 rtc::scoped_refptr<VideoTrackInterface> track( |
| 483 VideoTrack::Create(id, source, worker_thread_.get())); |
483 return VideoTrackProxy::Create(signaling_thread_, worker_thread_.get(), | 484 return VideoTrackProxy::Create(signaling_thread_, worker_thread_.get(), |
484 track); | 485 track); |
485 } | 486 } |
486 | 487 |
487 rtc::scoped_refptr<AudioTrackInterface> OrtcFactory::CreateAudioTrack( | 488 rtc::scoped_refptr<AudioTrackInterface> OrtcFactory::CreateAudioTrack( |
488 const std::string& id, | 489 const std::string& id, |
489 AudioSourceInterface* source) { | 490 AudioSourceInterface* source) { |
490 RTC_DCHECK_RUN_ON(signaling_thread_); | 491 RTC_DCHECK_RUN_ON(signaling_thread_); |
491 rtc::scoped_refptr<AudioTrackInterface> track(AudioTrack::Create(id, source)); | 492 rtc::scoped_refptr<AudioTrackInterface> track(AudioTrack::Create(id, source)); |
492 return AudioTrackProxy::Create(signaling_thread_, track); | 493 return AudioTrackProxy::Create(signaling_thread_, track); |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
544 // | 545 // |
545 // Note that |adm_| may be null, in which case the platform-specific default | 546 // Note that |adm_| may be null, in which case the platform-specific default |
546 // AudioDeviceModule will be used. | 547 // AudioDeviceModule will be used. |
547 return std::unique_ptr<cricket::MediaEngineInterface>( | 548 return std::unique_ptr<cricket::MediaEngineInterface>( |
548 cricket::WebRtcMediaEngineFactory::Create( | 549 cricket::WebRtcMediaEngineFactory::Create( |
549 adm_, audio_encoder_factory_, audio_decoder_factory_, nullptr, | 550 adm_, audio_encoder_factory_, audio_decoder_factory_, nullptr, |
550 nullptr, nullptr, webrtc::AudioProcessing::Create())); | 551 nullptr, nullptr, webrtc::AudioProcessing::Create())); |
551 } | 552 } |
552 | 553 |
553 } // namespace webrtc | 554 } // namespace webrtc |
OLD | NEW |