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