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

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

Issue 2110113003: Reland of "Move RtcEventLog object from inside VoiceEngine to Call.", "Fix to make the start/stop f… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 4 years, 5 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
« no previous file with comments | « webrtc/api/peerconnectionfactory.h ('k') | webrtc/api/peerconnectionfactoryproxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
234 rtc::scoped_refptr<PeerConnectionInterface> 223 rtc::scoped_refptr<PeerConnectionInterface>
235 PeerConnectionFactory::CreatePeerConnection( 224 PeerConnectionFactory::CreatePeerConnection(
236 const PeerConnectionInterface::RTCConfiguration& configuration_in, 225 const PeerConnectionInterface::RTCConfiguration& configuration_in,
237 const MediaConstraintsInterface* constraints, 226 const MediaConstraintsInterface* constraints,
238 std::unique_ptr<cricket::PortAllocator> allocator, 227 std::unique_ptr<cricket::PortAllocator> allocator,
239 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator, 228 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
240 PeerConnectionObserver* observer) { 229 PeerConnectionObserver* observer) {
241 RTC_DCHECK(signaling_thread_->IsCurrent()); 230 RTC_DCHECK(signaling_thread_->IsCurrent());
242 231
243 // We merge constraints and configuration into a single configuration. 232 // We merge constraints and configuration into a single configuration.
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 318 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
330 ASSERT(worker_thread_ == rtc::Thread::Current()); 319 ASSERT(worker_thread_ == rtc::Thread::Current());
331 return cricket::WebRtcMediaEngineFactory::Create( 320 return cricket::WebRtcMediaEngineFactory::Create(
332 default_adm_.get(), 321 default_adm_.get(),
333 audio_decoder_factory_, 322 audio_decoder_factory_,
334 video_encoder_factory_.get(), 323 video_encoder_factory_.get(),
335 video_decoder_factory_.get()); 324 video_decoder_factory_.get());
336 } 325 }
337 326
338 } // namespace webrtc 327 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectionfactory.h ('k') | webrtc/api/peerconnectionfactoryproxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698