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

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: Disable GCM if ENABLE_EXTERNAL_AUTH is defined. Created 4 years, 5 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_unittest.cc ('k') | webrtc/api/peerconnectionfactory.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 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 13 matching lines...) Expand all
24 24
25 namespace rtc { 25 namespace rtc {
26 class BasicNetworkManager; 26 class BasicNetworkManager;
27 class BasicPacketSocketFactory; 27 class BasicPacketSocketFactory;
28 } 28 }
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
32 class PeerConnectionFactory : public PeerConnectionFactoryInterface { 32 class PeerConnectionFactory : public PeerConnectionFactoryInterface {
33 public: 33 public:
34 void SetOptions(const Options& options) override { 34 void SetOptions(const Options& options) override;
35 options_ = options;
36 }
37 35
38 // Deprecated, use version without constraints. 36 // Deprecated, use version without constraints.
39 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 37 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
40 const PeerConnectionInterface::RTCConfiguration& configuration, 38 const PeerConnectionInterface::RTCConfiguration& configuration,
41 const MediaConstraintsInterface* constraints, 39 const MediaConstraintsInterface* constraints,
42 std::unique_ptr<cricket::PortAllocator> allocator, 40 std::unique_ptr<cricket::PortAllocator> allocator,
43 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator, 41 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
44 PeerConnectionObserver* observer) override; 42 PeerConnectionObserver* observer) override;
45 43
46 virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 44 virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // External Video decoder factory. This can be NULL if the client has not 127 // External Video decoder factory. This can be NULL if the client has not
130 // injected any. In that case, video engine will use the internal SW decoder. 128 // injected any. In that case, video engine will use the internal SW decoder.
131 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 129 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
132 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 130 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
133 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 131 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
134 }; 132 };
135 133
136 } // namespace webrtc 134 } // namespace webrtc
137 135
138 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 136 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection_unittest.cc ('k') | webrtc/api/peerconnectionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698