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

Side by Side Diff: webrtc/pc/peerconnection.cc

Issue 3005153002: Reland of Make RtcEventLogImpl to use a TaskQueue instead of a helper-thread (Closed)
Patch Set: . Created 3 years, 3 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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 1319 matching lines...) Expand 10 before | Expand all | Expand 10 after
1330 // Update stats here so that we have the most recent stats for tracks and 1330 // Update stats here so that we have the most recent stats for tracks and
1331 // streams before the channels are closed. 1331 // streams before the channels are closed.
1332 stats_->UpdateStats(kStatsOutputLevelStandard); 1332 stats_->UpdateStats(kStatsOutputLevelStandard);
1333 1333
1334 session_->Close(); 1334 session_->Close();
1335 network_thread()->Invoke<void>( 1335 network_thread()->Invoke<void>(
1336 RTC_FROM_HERE, 1336 RTC_FROM_HERE,
1337 rtc::Bind(&cricket::PortAllocator::DiscardCandidatePool, 1337 rtc::Bind(&cricket::PortAllocator::DiscardCandidatePool,
1338 port_allocator_.get())); 1338 port_allocator_.get()));
1339 1339
1340 factory_->worker_thread()->Invoke<void>(RTC_FROM_HERE, 1340 factory_->worker_thread()->Invoke<void>(RTC_FROM_HERE, [this] {
1341 [this] { call_.reset(); }); 1341 call_.reset();
1342 1342 // The event log must outlive call (and any other object that uses it).
1343 // The event log must outlive call (and any other object that uses it). 1343 event_log_.reset();
1344 event_log_.reset(); 1344 });
1345 } 1345 }
1346 1346
1347 void PeerConnection::OnSessionStateChange(WebRtcSession* /*session*/, 1347 void PeerConnection::OnSessionStateChange(WebRtcSession* /*session*/,
1348 WebRtcSession::State state) { 1348 WebRtcSession::State state) {
1349 switch (state) { 1349 switch (state) {
1350 case WebRtcSession::STATE_INIT: 1350 case WebRtcSession::STATE_INIT:
1351 ChangeSignalingState(PeerConnectionInterface::kStable); 1351 ChangeSignalingState(PeerConnectionInterface::kStable);
1352 break; 1352 break;
1353 case WebRtcSession::STATE_SENTOFFER: 1353 case WebRtcSession::STATE_SENTOFFER:
1354 ChangeSignalingState(PeerConnectionInterface::kHaveLocalOffer); 1354 ChangeSignalingState(PeerConnectionInterface::kHaveLocalOffer);
(...skipping 1169 matching lines...) Expand 10 before | Expand all | Expand 10 after
2524 return event_log_->StartLogging(file, max_size_bytes); 2524 return event_log_->StartLogging(file, max_size_bytes);
2525 } 2525 }
2526 2526
2527 void PeerConnection::StopRtcEventLog_w() { 2527 void PeerConnection::StopRtcEventLog_w() {
2528 if (event_log_) { 2528 if (event_log_) {
2529 event_log_->StopLogging(); 2529 event_log_->StopLogging();
2530 } 2530 }
2531 } 2531 }
2532 2532
2533 } // namespace webrtc 2533 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc ('k') | webrtc/pc/peerconnectionfactory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698