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

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

Issue 1759473003: Removed VideoSource dependency to ChannelManager. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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
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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 LocalAudioSource::Create(options_, constraints)); 197 LocalAudioSource::Create(options_, constraints));
198 return source; 198 return source;
199 } 199 }
200 200
201 rtc::scoped_refptr<VideoSourceInterface> 201 rtc::scoped_refptr<VideoSourceInterface>
202 PeerConnectionFactory::CreateVideoSource( 202 PeerConnectionFactory::CreateVideoSource(
203 cricket::VideoCapturer* capturer, 203 cricket::VideoCapturer* capturer,
204 const MediaConstraintsInterface* constraints) { 204 const MediaConstraintsInterface* constraints) {
205 RTC_DCHECK(signaling_thread_->IsCurrent()); 205 RTC_DCHECK(signaling_thread_->IsCurrent());
206 rtc::scoped_refptr<VideoSource> source(VideoSource::Create( 206 rtc::scoped_refptr<VideoSource> source(VideoSource::Create(
207 channel_manager_.get(), capturer, constraints, false)); 207 worker_thread_, capturer, constraints, false));
208 return VideoSourceProxy::Create(signaling_thread_, source); 208 return VideoSourceProxy::Create(signaling_thread_, source);
209 } 209 }
210 210
211 bool PeerConnectionFactory::StartAecDump(rtc::PlatformFile file, 211 bool PeerConnectionFactory::StartAecDump(rtc::PlatformFile file,
212 int64_t max_size_bytes) { 212 int64_t max_size_bytes) {
213 RTC_DCHECK(signaling_thread_->IsCurrent()); 213 RTC_DCHECK(signaling_thread_->IsCurrent());
214 return channel_manager_->StartAecDump(file, max_size_bytes); 214 return channel_manager_->StartAecDump(file, max_size_bytes);
215 } 215 }
216 216
217 void PeerConnectionFactory::StopAecDump() { 217 void PeerConnectionFactory::StopAecDump() {
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 } 305 }
306 306
307 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 307 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
308 ASSERT(worker_thread_ == rtc::Thread::Current()); 308 ASSERT(worker_thread_ == rtc::Thread::Current());
309 return cricket::WebRtcMediaEngineFactory::Create( 309 return cricket::WebRtcMediaEngineFactory::Create(
310 default_adm_.get(), video_encoder_factory_.get(), 310 default_adm_.get(), video_encoder_factory_.get(),
311 video_decoder_factory_.get()); 311 video_decoder_factory_.get());
312 } 312 }
313 313
314 } // namespace webrtc 314 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection.cc ('k') | webrtc/api/videosource.h » ('j') | webrtc/api/videosource.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698