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

Side by Side Diff: talk/app/webrtc/webrtcsession.h

Issue 1186083002: Ability to specify KeyType (RSA, ECDSA) in CreatePeerConnection (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: PeerConnectionFactoryInterface::CreatePeerConnection without KeyType Created 5 years, 6 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 | « talk/app/webrtc/test/peerconnectiontestwrapper.cc ('k') | talk/app/webrtc/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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 rtc::Thread* signaling_thread, 114 rtc::Thread* signaling_thread,
115 rtc::Thread* worker_thread, 115 rtc::Thread* worker_thread,
116 cricket::PortAllocator* port_allocator, 116 cricket::PortAllocator* port_allocator,
117 MediaStreamSignaling* mediastream_signaling); 117 MediaStreamSignaling* mediastream_signaling);
118 virtual ~WebRtcSession(); 118 virtual ~WebRtcSession();
119 119
120 bool Initialize( 120 bool Initialize(
121 const PeerConnectionFactoryInterface::Options& options, 121 const PeerConnectionFactoryInterface::Options& options,
122 const MediaConstraintsInterface* constraints, 122 const MediaConstraintsInterface* constraints,
123 DTLSIdentityServiceInterface* dtls_identity_service, 123 DTLSIdentityServiceInterface* dtls_identity_service,
124 rtc::KeyType key_type,
124 const PeerConnectionInterface::RTCConfiguration& rtc_configuration); 125 const PeerConnectionInterface::RTCConfiguration& rtc_configuration);
125 // Deletes the voice, video and data channel and changes the session state 126 // Deletes the voice, video and data channel and changes the session state
126 // to STATE_RECEIVEDTERMINATE. 127 // to STATE_RECEIVEDTERMINATE.
127 void Terminate(); 128 void Terminate();
128 129
129 void RegisterIceObserver(IceObserver* observer) { 130 void RegisterIceObserver(IceObserver* observer) {
130 ice_observer_ = observer; 131 ice_observer_ = observer;
131 } 132 }
132 133
133 virtual cricket::VoiceChannel* voice_channel() { 134 virtual cricket::VoiceChannel* voice_channel() {
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 PeerConnectionInterface::BundlePolicy bundle_policy_; 415 PeerConnectionInterface::BundlePolicy bundle_policy_;
415 416
416 // Declares the RTCP mux policy for the WebRTCSession. 417 // Declares the RTCP mux policy for the WebRTCSession.
417 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 418 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
418 419
419 DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 420 DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
420 }; 421 };
421 } // namespace webrtc 422 } // namespace webrtc
422 423
423 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ 424 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/test/peerconnectiontestwrapper.cc ('k') | talk/app/webrtc/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698