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

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

Issue 2013523002: Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: The side dish: Update ambigous calls 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
11 #ifndef WEBRTC_API_PEERCONNECTIONFACTORY_H_ 11 #ifndef WEBRTC_API_PEERCONNECTIONFACTORY_H_
12 #define WEBRTC_API_PEERCONNECTIONFACTORY_H_ 12 #define WEBRTC_API_PEERCONNECTIONFACTORY_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <string> 15 #include <string>
16 16
17 #include "webrtc/api/dtlsidentitystore.h"
18 #include "webrtc/api/mediacontroller.h" 17 #include "webrtc/api/mediacontroller.h"
19 #include "webrtc/api/mediastreaminterface.h" 18 #include "webrtc/api/mediastreaminterface.h"
20 #include "webrtc/api/peerconnectioninterface.h" 19 #include "webrtc/api/peerconnectioninterface.h"
21 #include "webrtc/base/scoped_ref_ptr.h" 20 #include "webrtc/base/scoped_ref_ptr.h"
22 #include "webrtc/base/thread.h" 21 #include "webrtc/base/thread.h"
22 #include "webrtc/base/rtccertificategenerator.h"
23 #include "webrtc/pc/channelmanager.h" 23 #include "webrtc/pc/channelmanager.h"
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 typedef rtc::RefCountedObject<DtlsIdentityStoreImpl> 32 typedef rtc::RefCountedObject<rtc::RTCCertificateGenerator>
33 RefCountedDtlsIdentityStore; 33 RefCountedRTCCertificateGenerator;
34 34
35 class PeerConnectionFactory : public PeerConnectionFactoryInterface { 35 class PeerConnectionFactory : public PeerConnectionFactoryInterface {
36 public: 36 public:
37 void SetOptions(const Options& options) override { 37 void SetOptions(const Options& options) override {
38 options_ = options; 38 options_ = options;
39 } 39 }
40 40
41 // Deprecated, use version without constraints. 41 // Deprecated, use version without constraints.
42 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 42 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
43 const PeerConnectionInterface::RTCConfiguration& configuration, 43 const PeerConnectionInterface::RTCConfiguration& configuration,
44 const MediaConstraintsInterface* constraints, 44 const MediaConstraintsInterface* constraints,
45 std::unique_ptr<cricket::PortAllocator> allocator, 45 std::unique_ptr<cricket::PortAllocator> allocator,
46 std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 46 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
47 PeerConnectionObserver* observer) override; 47 PeerConnectionObserver* observer) override;
48 48
49 virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 49 virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
50 const PeerConnectionInterface::RTCConfiguration& configuration, 50 const PeerConnectionInterface::RTCConfiguration& configuration,
51 std::unique_ptr<cricket::PortAllocator> allocator, 51 std::unique_ptr<cricket::PortAllocator> allocator,
52 std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 52 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
53 PeerConnectionObserver* observer) override; 53 PeerConnectionObserver* observer) override;
54 54
55 bool Initialize(); 55 bool Initialize();
56 56
57 rtc::scoped_refptr<MediaStreamInterface> 57 rtc::scoped_refptr<MediaStreamInterface>
58 CreateLocalMediaStream(const std::string& label) override; 58 CreateLocalMediaStream(const std::string& label) override;
59 59
60 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource( 60 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
61 const cricket::AudioOptions& options) override; 61 const cricket::AudioOptions& options) override;
62 // Deprecated, use version without constraints. 62 // Deprecated, use version without constraints.
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 std::unique_ptr<cricket::ChannelManager> channel_manager_; 122 std::unique_ptr<cricket::ChannelManager> channel_manager_;
123 // External Video encoder factory. This can be NULL if the client has not 123 // External Video encoder factory. This can be NULL if the client has not
124 // injected any. In that case, video engine will use the internal SW encoder. 124 // injected any. In that case, video engine will use the internal SW encoder.
125 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_; 125 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_;
126 // External Video decoder factory. This can be NULL if the client has not 126 // External Video decoder factory. This can be NULL if the client has not
127 // injected any. In that case, video engine will use the internal SW decoder. 127 // injected any. In that case, video engine will use the internal SW decoder.
128 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 128 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
129 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 129 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
130 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 130 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
131 131
132 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; 132 rtc::scoped_refptr<RefCountedRTCCertificateGenerator> cert_generator_;
133 }; 133 };
134 134
135 } // namespace webrtc 135 } // namespace webrtc
136 136
137 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 137 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698