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

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

Issue 2537343003: Removing "crypto_required" from MediaContentDescription. (Closed)
Patch Set: Merge with master and clean up CreateDataChannel 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 | « webrtc/api/statscollector_unittest.cc ('k') | webrtc/api/webrtcsession.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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 } 190 }
191 virtual cricket::VideoChannel* video_channel() { 191 virtual cricket::VideoChannel* video_channel() {
192 return video_channel_.get(); 192 return video_channel_.get();
193 } 193 }
194 virtual cricket::DataChannel* data_channel() { 194 virtual cricket::DataChannel* data_channel() {
195 return data_channel_.get(); 195 return data_channel_.get();
196 } 196 }
197 197
198 cricket::BaseChannel* GetChannel(const std::string& content_name); 198 cricket::BaseChannel* GetChannel(const std::string& content_name);
199 199
200 void SetSdesPolicy(cricket::SecurePolicy secure_policy);
201 cricket::SecurePolicy SdesPolicy() const; 200 cricket::SecurePolicy SdesPolicy() const;
202 201
203 // Get current ssl role from transport. 202 // Get current ssl role from transport.
204 bool GetSslRole(const std::string& transport_name, rtc::SSLRole* role); 203 bool GetSslRole(const std::string& transport_name, rtc::SSLRole* role);
205 204
206 // Get current SSL role for this channel's transport. 205 // Get current SSL role for this channel's transport.
207 // If |transport| is null, returns false. 206 // If |transport| is null, returns false.
208 bool GetSslRole(const cricket::BaseChannel* channel, rtc::SSLRole* role); 207 bool GetSslRole(const cricket::BaseChannel* channel, rtc::SSLRole* role);
209 208
210 void CreateOffer( 209 void CreateOffer(
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 Action action); 430 Action action);
432 431
433 // Returns true if we are ready to push down the remote candidate. 432 // Returns true if we are ready to push down the remote candidate.
434 // |remote_desc| is the new remote description, or NULL if the current remote 433 // |remote_desc| is the new remote description, or NULL if the current remote
435 // description should be used. Output |valid| is true if the candidate media 434 // description should be used. Output |valid| is true if the candidate media
436 // index is valid. 435 // index is valid.
437 bool ReadyToUseRemoteCandidate(const IceCandidateInterface* candidate, 436 bool ReadyToUseRemoteCandidate(const IceCandidateInterface* candidate,
438 const SessionDescriptionInterface* remote_desc, 437 const SessionDescriptionInterface* remote_desc,
439 bool* valid); 438 bool* valid);
440 439
440 // Returns true if SRTP (either using DTLS-SRTP or SDES) is required by
441 // this session.
442 bool SrtpRequired() const;
443
441 void OnTransportControllerConnectionState(cricket::IceConnectionState state); 444 void OnTransportControllerConnectionState(cricket::IceConnectionState state);
442 void OnTransportControllerReceiving(bool receiving); 445 void OnTransportControllerReceiving(bool receiving);
443 void OnTransportControllerGatheringState(cricket::IceGatheringState state); 446 void OnTransportControllerGatheringState(cricket::IceGatheringState state);
444 void OnTransportControllerCandidatesGathered( 447 void OnTransportControllerCandidatesGathered(
445 const std::string& transport_name, 448 const std::string& transport_name,
446 const std::vector<cricket::Candidate>& candidates); 449 const std::vector<cricket::Candidate>& candidates);
447 void OnTransportControllerCandidatesRemoved( 450 void OnTransportControllerCandidatesRemoved(
448 const std::vector<cricket::Candidate>& candidates); 451 const std::vector<cricket::Candidate>& candidates);
449 452
450 std::string GetSessionErrorMsg(); 453 std::string GetSessionErrorMsg();
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 523
521 #ifdef HAVE_QUIC 524 #ifdef HAVE_QUIC
522 std::unique_ptr<QuicDataTransport> quic_data_transport_; 525 std::unique_ptr<QuicDataTransport> quic_data_transport_;
523 #endif // HAVE_QUIC 526 #endif // HAVE_QUIC
524 527
525 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 528 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
526 }; 529 };
527 } // namespace webrtc 530 } // namespace webrtc
528 531
529 #endif // WEBRTC_API_WEBRTCSESSION_H_ 532 #endif // WEBRTC_API_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « webrtc/api/statscollector_unittest.cc ('k') | webrtc/api/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698