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

Side by Side Diff: talk/app/webrtc/peerconnectionfactoryproxy.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 2014 Google Inc. 3 * Copyright 2014 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 14 matching lines...) Expand all
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ 28 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_
29 #define TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ 29 #define TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_
30 30
31 #include <string> 31 #include <string>
32 32
33 #include "talk/app/webrtc/peerconnectioninterface.h" 33 #include "talk/app/webrtc/peerconnectioninterface.h"
34 #include "talk/app/webrtc/proxy.h" 34 #include "talk/app/webrtc/proxy.h"
35 #include "webrtc/base/sslidentity.h"
35 36
36 namespace webrtc { 37 namespace webrtc {
37 38
38 BEGIN_PROXY_MAP(PeerConnectionFactory) 39 BEGIN_PROXY_MAP(PeerConnectionFactory)
39 PROXY_METHOD1(void, SetOptions, const Options&) 40 PROXY_METHOD1(void, SetOptions, const Options&)
40 PROXY_METHOD5(rtc::scoped_refptr<PeerConnectionInterface>, 41 PROXY_METHOD6(rtc::scoped_refptr<PeerConnectionInterface>,
41 CreatePeerConnection, 42 CreatePeerConnection,
42 const PeerConnectionInterface::RTCConfiguration&, 43 const PeerConnectionInterface::RTCConfiguration&,
43 const MediaConstraintsInterface*, 44 const MediaConstraintsInterface*,
44 PortAllocatorFactoryInterface*, 45 PortAllocatorFactoryInterface*,
45 DTLSIdentityServiceInterface*, 46 PeerConnectionObserver*,
46 PeerConnectionObserver*) 47 DtlsIdentityStoreInterface*,
48 rtc::KeyType)
47 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, 49 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,
48 CreateLocalMediaStream, const std::string&) 50 CreateLocalMediaStream, const std::string&)
49 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, 51 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>,
50 CreateAudioSource, const MediaConstraintsInterface*) 52 CreateAudioSource, const MediaConstraintsInterface*)
51 PROXY_METHOD2(rtc::scoped_refptr<VideoSourceInterface>, 53 PROXY_METHOD2(rtc::scoped_refptr<VideoSourceInterface>,
52 CreateVideoSource, cricket::VideoCapturer*, 54 CreateVideoSource, cricket::VideoCapturer*,
53 const MediaConstraintsInterface*) 55 const MediaConstraintsInterface*)
54 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>, 56 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>,
55 CreateVideoTrack, const std::string&, VideoSourceInterface*) 57 CreateVideoTrack, const std::string&, VideoSourceInterface*)
56 PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>, 58 PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>,
57 CreateAudioTrack, const std::string&, AudioSourceInterface*) 59 CreateAudioTrack, const std::string&, AudioSourceInterface*)
58 PROXY_METHOD1(bool, StartAecDump, rtc::PlatformFile) 60 PROXY_METHOD1(bool, StartAecDump, rtc::PlatformFile)
59 END_PROXY() 61 END_PROXY()
60 62
61 } // namespace webrtc 63 } // namespace webrtc
62 64
63 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ 65 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698