| 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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 213                                          int64_t max_size_bytes) { | 213                                          int64_t max_size_bytes) { | 
| 214   RTC_DCHECK(signaling_thread_->IsCurrent()); | 214   RTC_DCHECK(signaling_thread_->IsCurrent()); | 
| 215   return channel_manager_->StartAecDump(file, max_size_bytes); | 215   return channel_manager_->StartAecDump(file, max_size_bytes); | 
| 216 } | 216 } | 
| 217 | 217 | 
| 218 void PeerConnectionFactory::StopAecDump() { | 218 void PeerConnectionFactory::StopAecDump() { | 
| 219   RTC_DCHECK(signaling_thread_->IsCurrent()); | 219   RTC_DCHECK(signaling_thread_->IsCurrent()); | 
| 220   channel_manager_->StopAecDump(); | 220   channel_manager_->StopAecDump(); | 
| 221 } | 221 } | 
| 222 | 222 | 
|  | 223 bool PeerConnectionFactory::StartRtcEventLog(rtc::PlatformFile file, | 
|  | 224                                              int64_t max_size_bytes) { | 
|  | 225   RTC_DCHECK(signaling_thread_->IsCurrent()); | 
|  | 226   return channel_manager_->StartRtcEventLog(file, max_size_bytes); | 
|  | 227 } | 
|  | 228 | 
|  | 229 void PeerConnectionFactory::StopRtcEventLog() { | 
|  | 230   RTC_DCHECK(signaling_thread_->IsCurrent()); | 
|  | 231   channel_manager_->StopRtcEventLog(); | 
|  | 232 } | 
|  | 233 | 
| 223 rtc::scoped_refptr<PeerConnectionInterface> | 234 rtc::scoped_refptr<PeerConnectionInterface> | 
| 224 PeerConnectionFactory::CreatePeerConnection( | 235 PeerConnectionFactory::CreatePeerConnection( | 
| 225     const PeerConnectionInterface::RTCConfiguration& configuration_in, | 236     const PeerConnectionInterface::RTCConfiguration& configuration_in, | 
| 226     const MediaConstraintsInterface* constraints, | 237     const MediaConstraintsInterface* constraints, | 
| 227     std::unique_ptr<cricket::PortAllocator> allocator, | 238     std::unique_ptr<cricket::PortAllocator> allocator, | 
| 228     std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator, | 239     std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator, | 
| 229     PeerConnectionObserver* observer) { | 240     PeerConnectionObserver* observer) { | 
| 230   RTC_DCHECK(signaling_thread_->IsCurrent()); | 241   RTC_DCHECK(signaling_thread_->IsCurrent()); | 
| 231 | 242 | 
| 232   // We merge constraints and configuration into a single configuration. | 243   // We merge constraints and configuration into a single configuration. | 
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 318 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 329 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 
| 319   ASSERT(worker_thread_ == rtc::Thread::Current()); | 330   ASSERT(worker_thread_ == rtc::Thread::Current()); | 
| 320   return cricket::WebRtcMediaEngineFactory::Create( | 331   return cricket::WebRtcMediaEngineFactory::Create( | 
| 321       default_adm_.get(), | 332       default_adm_.get(), | 
| 322       audio_decoder_factory_, | 333       audio_decoder_factory_, | 
| 323       video_encoder_factory_.get(), | 334       video_encoder_factory_.get(), | 
| 324       video_decoder_factory_.get()); | 335       video_decoder_factory_.get()); | 
| 325 } | 336 } | 
| 326 | 337 | 
| 327 }  // namespace webrtc | 338 }  // namespace webrtc | 
| OLD | NEW | 
|---|