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

Side by Side Diff: webrtc/pc/peerconnectionfactory.cc

Issue 2989113002: Reland of Change VideoTrack implementation to invoke VideoTrackSourceInterface::AddOrUpdateSink on … (Closed)
Patch Set: Readd default implementation of AddSink and RemoveSink. Created 3 years, 4 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/pc/mediastream_unittest.cc ('k') | webrtc/pc/peerconnectioninterface_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 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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 RTC_DCHECK(signaling_thread_->IsCurrent()); 285 RTC_DCHECK(signaling_thread_->IsCurrent());
286 return MediaStreamProxy::Create(signaling_thread_, 286 return MediaStreamProxy::Create(signaling_thread_,
287 MediaStream::Create(label)); 287 MediaStream::Create(label));
288 } 288 }
289 289
290 rtc::scoped_refptr<VideoTrackInterface> PeerConnectionFactory::CreateVideoTrack( 290 rtc::scoped_refptr<VideoTrackInterface> PeerConnectionFactory::CreateVideoTrack(
291 const std::string& id, 291 const std::string& id,
292 VideoTrackSourceInterface* source) { 292 VideoTrackSourceInterface* source) {
293 RTC_DCHECK(signaling_thread_->IsCurrent()); 293 RTC_DCHECK(signaling_thread_->IsCurrent());
294 rtc::scoped_refptr<VideoTrackInterface> track( 294 rtc::scoped_refptr<VideoTrackInterface> track(
295 VideoTrack::Create(id, source)); 295 VideoTrack::Create(id, source, worker_thread_));
296 return VideoTrackProxy::Create(signaling_thread_, worker_thread_, track); 296 return VideoTrackProxy::Create(signaling_thread_, worker_thread_, track);
297 } 297 }
298 298
299 rtc::scoped_refptr<AudioTrackInterface> 299 rtc::scoped_refptr<AudioTrackInterface>
300 PeerConnectionFactory::CreateAudioTrack(const std::string& id, 300 PeerConnectionFactory::CreateAudioTrack(const std::string& id,
301 AudioSourceInterface* source) { 301 AudioSourceInterface* source) {
302 RTC_DCHECK(signaling_thread_->IsCurrent()); 302 RTC_DCHECK(signaling_thread_->IsCurrent());
303 rtc::scoped_refptr<AudioTrackInterface> track(AudioTrack::Create(id, source)); 303 rtc::scoped_refptr<AudioTrackInterface> track(AudioTrack::Create(id, source));
304 return AudioTrackProxy::Create(signaling_thread_, track); 304 return AudioTrackProxy::Create(signaling_thread_, track);
305 } 305 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 } 343 }
344 call_config.audio_state = channel_manager_->media_engine()->GetAudioState(); 344 call_config.audio_state = channel_manager_->media_engine()->GetAudioState();
345 call_config.bitrate_config.min_bitrate_bps = kMinBandwidthBps; 345 call_config.bitrate_config.min_bitrate_bps = kMinBandwidthBps;
346 call_config.bitrate_config.start_bitrate_bps = kStartBandwidthBps; 346 call_config.bitrate_config.start_bitrate_bps = kStartBandwidthBps;
347 call_config.bitrate_config.max_bitrate_bps = kMaxBandwidthBps; 347 call_config.bitrate_config.max_bitrate_bps = kMaxBandwidthBps;
348 348
349 return std::unique_ptr<Call>(call_factory_->CreateCall(call_config)); 349 return std::unique_ptr<Call>(call_factory_->CreateCall(call_config));
350 } 350 }
351 351
352 } // namespace webrtc 352 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/mediastream_unittest.cc ('k') | webrtc/pc/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698