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

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

Issue 2590753002: Implement current/pending session description methods. (Closed)
Patch Set: Fixing null pointer deref. Created 3 years, 12 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/peerconnection.h ('k') | webrtc/api/peerconnectioninterface.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 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 1370 matching lines...) Expand 10 before | Expand all | Expand 10 after
1381 } 1381 }
1382 1382
1383 const SessionDescriptionInterface* PeerConnection::local_description() const { 1383 const SessionDescriptionInterface* PeerConnection::local_description() const {
1384 return session_->local_description(); 1384 return session_->local_description();
1385 } 1385 }
1386 1386
1387 const SessionDescriptionInterface* PeerConnection::remote_description() const { 1387 const SessionDescriptionInterface* PeerConnection::remote_description() const {
1388 return session_->remote_description(); 1388 return session_->remote_description();
1389 } 1389 }
1390 1390
1391 const SessionDescriptionInterface* PeerConnection::current_local_description()
1392 const {
1393 return session_->current_local_description();
1394 }
1395
1396 const SessionDescriptionInterface* PeerConnection::current_remote_description()
1397 const {
1398 return session_->current_remote_description();
1399 }
1400
1401 const SessionDescriptionInterface* PeerConnection::pending_local_description()
1402 const {
1403 return session_->pending_local_description();
1404 }
1405
1406 const SessionDescriptionInterface* PeerConnection::pending_remote_description()
1407 const {
1408 return session_->pending_remote_description();
1409 }
1410
1391 void PeerConnection::Close() { 1411 void PeerConnection::Close() {
1392 TRACE_EVENT0("webrtc", "PeerConnection::Close"); 1412 TRACE_EVENT0("webrtc", "PeerConnection::Close");
1393 // Update stats here so that we have the most recent stats for tracks and 1413 // Update stats here so that we have the most recent stats for tracks and
1394 // streams before the channels are closed. 1414 // streams before the channels are closed.
1395 stats_->UpdateStats(kStatsOutputLevelStandard); 1415 stats_->UpdateStats(kStatsOutputLevelStandard);
1396 1416
1397 session_->Close(); 1417 session_->Close();
1398 } 1418 }
1399 1419
1400 void PeerConnection::OnSessionStateChange(WebRtcSession* /*session*/, 1420 void PeerConnection::OnSessionStateChange(WebRtcSession* /*session*/,
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
2410 2430
2411 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file, 2431 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file,
2412 int64_t max_size_bytes) { 2432 int64_t max_size_bytes) {
2413 return event_log_->StartLogging(file, max_size_bytes); 2433 return event_log_->StartLogging(file, max_size_bytes);
2414 } 2434 }
2415 2435
2416 void PeerConnection::StopRtcEventLog_w() { 2436 void PeerConnection::StopRtcEventLog_w() {
2417 event_log_->StopLogging(); 2437 event_log_->StopLogging();
2418 } 2438 }
2419 } // namespace webrtc 2439 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection.h ('k') | webrtc/api/peerconnectioninterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698