Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: webrtc/ortc/ortcfactory.cc

Issue 2979493003: Revert: Change VideoTrack implementation to invoke VideoTrackSourceInterface::AddOrUpdateSink on wt (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/api/mediastreaminterface.h ('k') | webrtc/pc/mediastream_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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( 481 rtc::scoped_refptr<VideoTrackInterface> track(VideoTrack::Create(id, source));
482 VideoTrack::Create(id, source, worker_thread_.get()));
483 return VideoTrackProxy::Create(signaling_thread_, worker_thread_.get(), 482 return VideoTrackProxy::Create(signaling_thread_, worker_thread_.get(),
484 track); 483 track);
485 } 484 }
486 485
487 rtc::scoped_refptr<AudioTrackInterface> OrtcFactory::CreateAudioTrack( 486 rtc::scoped_refptr<AudioTrackInterface> OrtcFactory::CreateAudioTrack(
488 const std::string& id, 487 const std::string& id,
489 AudioSourceInterface* source) { 488 AudioSourceInterface* source) {
490 RTC_DCHECK_RUN_ON(signaling_thread_); 489 RTC_DCHECK_RUN_ON(signaling_thread_);
491 rtc::scoped_refptr<AudioTrackInterface> track(AudioTrack::Create(id, source)); 490 rtc::scoped_refptr<AudioTrackInterface> track(AudioTrack::Create(id, source));
492 return AudioTrackProxy::Create(signaling_thread_, track); 491 return AudioTrackProxy::Create(signaling_thread_, track);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 // 543 //
545 // Note that |adm_| may be null, in which case the platform-specific default 544 // Note that |adm_| may be null, in which case the platform-specific default
546 // AudioDeviceModule will be used. 545 // AudioDeviceModule will be used.
547 return std::unique_ptr<cricket::MediaEngineInterface>( 546 return std::unique_ptr<cricket::MediaEngineInterface>(
548 cricket::WebRtcMediaEngineFactory::Create(adm_, audio_encoder_factory_, 547 cricket::WebRtcMediaEngineFactory::Create(adm_, audio_encoder_factory_,
549 audio_decoder_factory_, nullptr, 548 audio_decoder_factory_, nullptr,
550 nullptr, nullptr)); 549 nullptr, nullptr));
551 } 550 }
552 551
553 } // namespace webrtc 552 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/mediastreaminterface.h ('k') | webrtc/pc/mediastream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698