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

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: Updated RTP/RTCP module to use setter methods instead of passing the event log pointer in the const… 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
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() {
218 RTC_DCHECK(signaling_thread_->IsCurrent()); 218 RTC_DCHECK(signaling_thread_->IsCurrent());
219 channel_manager_->StopAecDump(); 219 channel_manager_->StopAecDump();
220 } 220 }
221 221
222 bool PeerConnectionFactory::StartRtcEventLog(rtc::PlatformFile file) {
terelius 2016/03/10 10:42:32 I'm sorry, but I don't see why it is safe to effec
ivoc 2016/03/10 13:15:36 Note that the functions still exist on PeerConnect
223 RTC_DCHECK(signaling_thread_->IsCurrent());
224 return channel_manager_->StartRtcEventLog(file);
225 }
226
227 void PeerConnectionFactory::StopRtcEventLog() {
228 RTC_DCHECK(signaling_thread_->IsCurrent());
229 channel_manager_->StopRtcEventLog();
230 }
231
232 rtc::scoped_refptr<PeerConnectionInterface> 222 rtc::scoped_refptr<PeerConnectionInterface>
233 PeerConnectionFactory::CreatePeerConnection( 223 PeerConnectionFactory::CreatePeerConnection(
234 const PeerConnectionInterface::RTCConfiguration& configuration, 224 const PeerConnectionInterface::RTCConfiguration& configuration,
235 const MediaConstraintsInterface* constraints, 225 const MediaConstraintsInterface* constraints,
236 rtc::scoped_ptr<cricket::PortAllocator> allocator, 226 rtc::scoped_ptr<cricket::PortAllocator> allocator,
237 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 227 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
238 PeerConnectionObserver* observer) { 228 PeerConnectionObserver* observer) {
239 RTC_DCHECK(signaling_thread_->IsCurrent()); 229 RTC_DCHECK(signaling_thread_->IsCurrent());
240 230
241 if (!dtls_identity_store.get()) { 231 if (!dtls_identity_store.get()) {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 } 295 }
306 296
307 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 297 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
308 ASSERT(worker_thread_ == rtc::Thread::Current()); 298 ASSERT(worker_thread_ == rtc::Thread::Current());
309 return cricket::WebRtcMediaEngineFactory::Create( 299 return cricket::WebRtcMediaEngineFactory::Create(
310 default_adm_.get(), video_encoder_factory_.get(), 300 default_adm_.get(), video_encoder_factory_.get(),
311 video_decoder_factory_.get()); 301 video_decoder_factory_.get());
312 } 302 }
313 303
314 } // namespace webrtc 304 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698