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

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

Issue 1748403002: Move RtcEventLog object from inside VoiceEngine to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix for failing tests. Created 4 years, 8 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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 int64_t max_size_bytes) { 226 int64_t max_size_bytes) {
227 RTC_DCHECK(signaling_thread_->IsCurrent()); 227 RTC_DCHECK(signaling_thread_->IsCurrent());
228 return channel_manager_->StartAecDump(file, max_size_bytes); 228 return channel_manager_->StartAecDump(file, max_size_bytes);
229 } 229 }
230 230
231 void PeerConnectionFactory::StopAecDump() { 231 void PeerConnectionFactory::StopAecDump() {
232 RTC_DCHECK(signaling_thread_->IsCurrent()); 232 RTC_DCHECK(signaling_thread_->IsCurrent());
233 channel_manager_->StopAecDump(); 233 channel_manager_->StopAecDump();
234 } 234 }
235 235
236 bool PeerConnectionFactory::StartRtcEventLog(rtc::PlatformFile file) {
237 RTC_DCHECK(signaling_thread_->IsCurrent());
238 return channel_manager_->StartRtcEventLog(file);
239 }
240
241 void PeerConnectionFactory::StopRtcEventLog() {
242 RTC_DCHECK(signaling_thread_->IsCurrent());
243 channel_manager_->StopRtcEventLog();
244 }
245
246 rtc::scoped_refptr<PeerConnectionInterface> 236 rtc::scoped_refptr<PeerConnectionInterface>
247 PeerConnectionFactory::CreatePeerConnection( 237 PeerConnectionFactory::CreatePeerConnection(
248 const PeerConnectionInterface::RTCConfiguration& configuration_in, 238 const PeerConnectionInterface::RTCConfiguration& configuration_in,
249 const MediaConstraintsInterface* constraints, 239 const MediaConstraintsInterface* constraints,
250 rtc::scoped_ptr<cricket::PortAllocator> allocator, 240 rtc::scoped_ptr<cricket::PortAllocator> allocator,
251 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 241 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
252 PeerConnectionObserver* observer) { 242 PeerConnectionObserver* observer) {
253 RTC_DCHECK(signaling_thread_->IsCurrent()); 243 RTC_DCHECK(signaling_thread_->IsCurrent());
254 244
255 // We merge constraints and configuration into a single configuration. 245 // We merge constraints and configuration into a single configuration.
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 } 341 }
352 342
353 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 343 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
354 ASSERT(worker_thread_ == rtc::Thread::Current()); 344 ASSERT(worker_thread_ == rtc::Thread::Current());
355 return cricket::WebRtcMediaEngineFactory::Create( 345 return cricket::WebRtcMediaEngineFactory::Create(
356 default_adm_.get(), video_encoder_factory_.get(), 346 default_adm_.get(), video_encoder_factory_.get(),
357 video_decoder_factory_.get()); 347 video_decoder_factory_.get());
358 } 348 }
359 349
360 } // namespace webrtc 350 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698