OLD | NEW |
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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 | 295 |
296 rtc::scoped_refptr<AudioTrackInterface> | 296 rtc::scoped_refptr<AudioTrackInterface> |
297 PeerConnectionFactory::CreateAudioTrack(const std::string& id, | 297 PeerConnectionFactory::CreateAudioTrack(const std::string& id, |
298 AudioSourceInterface* source) { | 298 AudioSourceInterface* source) { |
299 RTC_DCHECK(signaling_thread_->IsCurrent()); | 299 RTC_DCHECK(signaling_thread_->IsCurrent()); |
300 rtc::scoped_refptr<AudioTrackInterface> track(AudioTrack::Create(id, source)); | 300 rtc::scoped_refptr<AudioTrackInterface> track(AudioTrack::Create(id, source)); |
301 return AudioTrackProxy::Create(signaling_thread_, track); | 301 return AudioTrackProxy::Create(signaling_thread_, track); |
302 } | 302 } |
303 | 303 |
304 webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController( | 304 webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController( |
305 const cricket::MediaConfig& config) const { | 305 const cricket::MediaConfig& config, |
| 306 webrtc::RtcEventLog* event_log) const { |
306 RTC_DCHECK(signaling_thread_->IsCurrent()); | 307 RTC_DCHECK(signaling_thread_->IsCurrent()); |
307 return MediaControllerInterface::Create(config, worker_thread_, | 308 return MediaControllerInterface::Create(config, worker_thread_, |
308 channel_manager_.get()); | 309 channel_manager_.get(), event_log); |
309 } | 310 } |
310 | 311 |
311 cricket::TransportController* PeerConnectionFactory::CreateTransportController( | 312 cricket::TransportController* PeerConnectionFactory::CreateTransportController( |
312 cricket::PortAllocator* port_allocator, | 313 cricket::PortAllocator* port_allocator, |
313 bool redetermine_role_on_ice_restart) { | 314 bool redetermine_role_on_ice_restart) { |
314 RTC_DCHECK(signaling_thread_->IsCurrent()); | 315 RTC_DCHECK(signaling_thread_->IsCurrent()); |
315 return new cricket::TransportController(signaling_thread_, network_thread_, | 316 return new cricket::TransportController(signaling_thread_, network_thread_, |
316 port_allocator, | 317 port_allocator, |
317 redetermine_role_on_ice_restart); | 318 redetermine_role_on_ice_restart); |
318 } | 319 } |
(...skipping 16 matching lines...) Expand all Loading... |
335 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 336 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { |
336 ASSERT(worker_thread_ == rtc::Thread::Current()); | 337 ASSERT(worker_thread_ == rtc::Thread::Current()); |
337 return cricket::WebRtcMediaEngineFactory::Create( | 338 return cricket::WebRtcMediaEngineFactory::Create( |
338 default_adm_.get(), | 339 default_adm_.get(), |
339 audio_decoder_factory_, | 340 audio_decoder_factory_, |
340 video_encoder_factory_.get(), | 341 video_encoder_factory_.get(), |
341 video_decoder_factory_.get()); | 342 video_decoder_factory_.get()); |
342 } | 343 } |
343 | 344 |
344 } // namespace webrtc | 345 } // namespace webrtc |
OLD | NEW |