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

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: Processed review comments and rebased. 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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 int64_t max_size_bytes) { 231 int64_t max_size_bytes) {
232 RTC_DCHECK(signaling_thread_->IsCurrent()); 232 RTC_DCHECK(signaling_thread_->IsCurrent());
233 return channel_manager_->StartAecDump(file, max_size_bytes); 233 return channel_manager_->StartAecDump(file, max_size_bytes);
234 } 234 }
235 235
236 void PeerConnectionFactory::StopAecDump() { 236 void PeerConnectionFactory::StopAecDump() {
237 RTC_DCHECK(signaling_thread_->IsCurrent()); 237 RTC_DCHECK(signaling_thread_->IsCurrent());
238 channel_manager_->StopAecDump(); 238 channel_manager_->StopAecDump();
239 } 239 }
240 240
241 bool PeerConnectionFactory::StartRtcEventLog(rtc::PlatformFile file) {
242 RTC_DCHECK(signaling_thread_->IsCurrent());
243 return channel_manager_->StartRtcEventLog(file);
244 }
245
246 void PeerConnectionFactory::StopRtcEventLog() {
247 RTC_DCHECK(signaling_thread_->IsCurrent());
248 channel_manager_->StopRtcEventLog();
249 }
250
251 rtc::scoped_refptr<PeerConnectionInterface> 241 rtc::scoped_refptr<PeerConnectionInterface>
252 PeerConnectionFactory::CreatePeerConnection( 242 PeerConnectionFactory::CreatePeerConnection(
253 const PeerConnectionInterface::RTCConfiguration& configuration_in, 243 const PeerConnectionInterface::RTCConfiguration& configuration_in,
254 const MediaConstraintsInterface* constraints, 244 const MediaConstraintsInterface* constraints,
255 rtc::scoped_ptr<cricket::PortAllocator> allocator, 245 rtc::scoped_ptr<cricket::PortAllocator> allocator,
256 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 246 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
257 PeerConnectionObserver* observer) { 247 PeerConnectionObserver* observer) {
258 RTC_DCHECK(signaling_thread_->IsCurrent()); 248 RTC_DCHECK(signaling_thread_->IsCurrent());
259 249
260 // We merge constraints and configuration into a single configuration. 250 // We merge constraints and configuration into a single configuration.
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 } 346 }
357 347
358 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 348 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
359 ASSERT(worker_thread_ == rtc::Thread::Current()); 349 ASSERT(worker_thread_ == rtc::Thread::Current());
360 return cricket::WebRtcMediaEngineFactory::Create( 350 return cricket::WebRtcMediaEngineFactory::Create(
361 default_adm_.get(), video_encoder_factory_.get(), 351 default_adm_.get(), video_encoder_factory_.get(),
362 video_decoder_factory_.get()); 352 video_decoder_factory_.get());
363 } 353 }
364 354
365 } // namespace webrtc 355 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698