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

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

Issue 1151943005: Ability to specify KeyType (RSA, ECDSA) for SSLIdentity generation in libjingle (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressing ASAN, LSAN issues in unittests 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 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 16 matching lines...) Expand all
27 27
28 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_ 28 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_
29 #define TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_ 29 #define TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_
30 30
31 #include <string> 31 #include <string>
32 32
33 #include "talk/app/webrtc/mediastreaminterface.h" 33 #include "talk/app/webrtc/mediastreaminterface.h"
34 #include "talk/app/webrtc/peerconnectioninterface.h" 34 #include "talk/app/webrtc/peerconnectioninterface.h"
35 #include "talk/session/media/channelmanager.h" 35 #include "talk/session/media/channelmanager.h"
36 #include "webrtc/base/scoped_ptr.h" 36 #include "webrtc/base/scoped_ptr.h"
37 #include "webrtc/base/sslidentity.h"
37 #include "webrtc/base/thread.h" 38 #include "webrtc/base/thread.h"
38 39
39 namespace webrtc { 40 namespace webrtc {
40 41
41 class DtlsIdentityStore; 42 class DtlsIdentityStore;
42 43
43 class PeerConnectionFactory : public PeerConnectionFactoryInterface { 44 class PeerConnectionFactory : public PeerConnectionFactoryInterface {
44 public: 45 public:
45 virtual void SetOptions(const Options& options) { 46 virtual void SetOptions(const Options& options) {
46 options_ = options; 47 options_ = options;
47 } 48 }
48 49
49 virtual rtc::scoped_refptr<PeerConnectionInterface> 50 rtc::scoped_refptr<PeerConnectionInterface>
50 CreatePeerConnection( 51 CreatePeerConnection(
51 const PeerConnectionInterface::RTCConfiguration& configuration, 52 const PeerConnectionInterface::RTCConfiguration& configuration,
52 const MediaConstraintsInterface* constraints, 53 const MediaConstraintsInterface* constraints,
53 PortAllocatorFactoryInterface* allocator_factory, 54 PortAllocatorFactoryInterface* allocator_factory,
54 DTLSIdentityServiceInterface* dtls_identity_service, 55 PeerConnectionObserver* observer,
55 PeerConnectionObserver* observer); 56 DtlsIdentityStoreInterface* dtls_identity_store,
57 rtc::KeyType key_type = rtc::KT_DEFAULT) override;
56 58
57 bool Initialize(); 59 bool Initialize();
58 60
59 rtc::scoped_refptr<MediaStreamInterface> 61 rtc::scoped_refptr<MediaStreamInterface>
60 CreateLocalMediaStream(const std::string& label) override; 62 CreateLocalMediaStream(const std::string& label) override;
61 63
62 rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource( 64 rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
63 const MediaConstraintsInterface* constraints) override; 65 const MediaConstraintsInterface* constraints) override;
64 66
65 rtc::scoped_refptr<VideoSourceInterface> CreateVideoSource( 67 rtc::scoped_refptr<VideoSourceInterface> CreateVideoSource(
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 rtc::scoped_ptr<cricket::ChannelManager> channel_manager_; 107 rtc::scoped_ptr<cricket::ChannelManager> channel_manager_;
106 // External Video encoder factory. This can be NULL if the client has not 108 // External Video encoder factory. This can be NULL if the client has not
107 // injected any. In that case, video engine will use the internal SW encoder. 109 // injected any. In that case, video engine will use the internal SW encoder.
108 rtc::scoped_ptr<cricket::WebRtcVideoEncoderFactory> 110 rtc::scoped_ptr<cricket::WebRtcVideoEncoderFactory>
109 video_encoder_factory_; 111 video_encoder_factory_;
110 // External Video decoder factory. This can be NULL if the client has not 112 // External Video decoder factory. This can be NULL if the client has not
111 // injected any. In that case, video engine will use the internal SW decoder. 113 // injected any. In that case, video engine will use the internal SW decoder.
112 rtc::scoped_ptr<cricket::WebRtcVideoDecoderFactory> 114 rtc::scoped_ptr<cricket::WebRtcVideoDecoderFactory>
113 video_decoder_factory_; 115 video_decoder_factory_;
114 116
115 rtc::scoped_ptr<webrtc::DtlsIdentityStore> dtls_identity_store_; 117 rtc::scoped_ptr<webrtc::DtlsIdentityStoreInterface> dtls_identity_store_;
116 }; 118 };
117 119
118 } // namespace webrtc 120 } // namespace webrtc
119 121
120 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_ 122 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698