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

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

Issue 2590753002: Implement current/pending session description methods. (Closed)
Patch Set: Fixing null pointer deref. Created 4 years 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 | « no previous file | webrtc/api/peerconnection.cc » ('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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 StatsOutputLevel level) override; 106 StatsOutputLevel level) override;
107 void GetStats(RTCStatsCollectorCallback* callback) override; 107 void GetStats(RTCStatsCollectorCallback* callback) override;
108 108
109 SignalingState signaling_state() override; 109 SignalingState signaling_state() override;
110 110
111 IceConnectionState ice_connection_state() override; 111 IceConnectionState ice_connection_state() override;
112 IceGatheringState ice_gathering_state() override; 112 IceGatheringState ice_gathering_state() override;
113 113
114 const SessionDescriptionInterface* local_description() const override; 114 const SessionDescriptionInterface* local_description() const override;
115 const SessionDescriptionInterface* remote_description() const override; 115 const SessionDescriptionInterface* remote_description() const override;
116 const SessionDescriptionInterface* current_local_description() const override;
117 const SessionDescriptionInterface* current_remote_description()
118 const override;
119 const SessionDescriptionInterface* pending_local_description() const override;
120 const SessionDescriptionInterface* pending_remote_description()
121 const override;
116 122
117 // JSEP01 123 // JSEP01
118 // Deprecated, use version without constraints. 124 // Deprecated, use version without constraints.
119 void CreateOffer(CreateSessionDescriptionObserver* observer, 125 void CreateOffer(CreateSessionDescriptionObserver* observer,
120 const MediaConstraintsInterface* constraints) override; 126 const MediaConstraintsInterface* constraints) override;
121 void CreateOffer(CreateSessionDescriptionObserver* observer, 127 void CreateOffer(CreateSessionDescriptionObserver* observer,
122 const RTCOfferAnswerOptions& options) override; 128 const RTCOfferAnswerOptions& options) override;
123 // Deprecated, use version without constraints. 129 // Deprecated, use version without constraints.
124 void CreateAnswer(CreateSessionDescriptionObserver* observer, 130 void CreateAnswer(CreateSessionDescriptionObserver* observer,
125 const MediaConstraintsInterface* constraints) override; 131 const MediaConstraintsInterface* constraints) override;
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>> 434 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>>
429 receivers_; 435 receivers_;
430 std::unique_ptr<WebRtcSession> session_; 436 std::unique_ptr<WebRtcSession> session_;
431 std::unique_ptr<StatsCollector> stats_; 437 std::unique_ptr<StatsCollector> stats_;
432 rtc::scoped_refptr<RTCStatsCollector> stats_collector_; 438 rtc::scoped_refptr<RTCStatsCollector> stats_collector_;
433 }; 439 };
434 440
435 } // namespace webrtc 441 } // namespace webrtc
436 442
437 #endif // WEBRTC_API_PEERCONNECTION_H_ 443 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698