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

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

Issue 1528843005: Add support for GCM cipher suites from RFC 7714. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Feedback from Matt Created 4 years, 7 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 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2011 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 17 matching lines...) Expand all
28 class BasicPacketSocketFactory; 28 class BasicPacketSocketFactory;
29 } 29 }
30 30
31 namespace webrtc { 31 namespace webrtc {
32 32
33 typedef rtc::RefCountedObject<DtlsIdentityStoreImpl> 33 typedef rtc::RefCountedObject<DtlsIdentityStoreImpl>
34 RefCountedDtlsIdentityStore; 34 RefCountedDtlsIdentityStore;
35 35
36 class PeerConnectionFactory : public PeerConnectionFactoryInterface { 36 class PeerConnectionFactory : public PeerConnectionFactoryInterface {
37 public: 37 public:
38 virtual void SetOptions(const Options& options) { 38 void SetOptions(const Options& options) override;
39 options_ = options;
40 }
41 39
42 // Deprecated, use version without constraints. 40 // Deprecated, use version without constraints.
43 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 41 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
44 const PeerConnectionInterface::RTCConfiguration& configuration, 42 const PeerConnectionInterface::RTCConfiguration& configuration,
45 const MediaConstraintsInterface* constraints, 43 const MediaConstraintsInterface* constraints,
46 std::unique_ptr<cricket::PortAllocator> allocator, 44 std::unique_ptr<cricket::PortAllocator> allocator,
47 std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 45 std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
48 PeerConnectionObserver* observer) override; 46 PeerConnectionObserver* observer) override;
49 47
50 virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 48 virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 120 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
123 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 121 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
124 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 122 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
125 123
126 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; 124 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_;
127 }; 125 };
128 126
129 } // namespace webrtc 127 } // namespace webrtc
130 128
131 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 129 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698