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

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

Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: webrtcsession unittest added to ensure when a cert is provided it is used Created 5 years, 4 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 virtual void SetOptions(const Options& options) { 45 virtual void SetOptions(const Options& options) {
46 options_ = options; 46 options_ = options;
47 } 47 }
48 48
49 virtual rtc::scoped_refptr<PeerConnectionInterface> 49 virtual rtc::scoped_refptr<PeerConnectionInterface>
50 CreatePeerConnection( 50 CreatePeerConnection(
51 const PeerConnectionInterface::RTCConfiguration& configuration, 51 const PeerConnectionInterface::RTCConfiguration& configuration,
52 const MediaConstraintsInterface* constraints, 52 const MediaConstraintsInterface* constraints,
53 PortAllocatorFactoryInterface* allocator_factory, 53 PortAllocatorFactoryInterface* allocator_factory,
54 DTLSIdentityServiceInterface* dtls_identity_service, 54 DTLSIdentityServiceInterface* dtls_identity_service,
55 PeerConnectionObserver* observer); 55 rtc::scoped_refptr<DtlsCertificate> certificate,
Henrik Grunell WebRTC 2015/08/06 14:06:52 Create a new function instead that takes a certifi
hbos 2015/08/10 15:10:18 Acknowledged.
56 PeerConnectionObserver* observer) override;
56 57
57 bool Initialize(); 58 bool Initialize();
58 59
59 rtc::scoped_refptr<MediaStreamInterface> 60 rtc::scoped_refptr<MediaStreamInterface>
60 CreateLocalMediaStream(const std::string& label) override; 61 CreateLocalMediaStream(const std::string& label) override;
61 62
62 rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource( 63 rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
63 const MediaConstraintsInterface* constraints) override; 64 const MediaConstraintsInterface* constraints) override;
64 65
65 rtc::scoped_refptr<VideoSourceInterface> CreateVideoSource( 66 rtc::scoped_refptr<VideoSourceInterface> CreateVideoSource(
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 // injected any. In that case, video engine will use the internal SW decoder. 112 // injected any. In that case, video engine will use the internal SW decoder.
112 rtc::scoped_ptr<cricket::WebRtcVideoDecoderFactory> 113 rtc::scoped_ptr<cricket::WebRtcVideoDecoderFactory>
113 video_decoder_factory_; 114 video_decoder_factory_;
114 115
115 rtc::scoped_ptr<webrtc::DtlsIdentityStore> dtls_identity_store_; 116 rtc::scoped_ptr<webrtc::DtlsIdentityStore> dtls_identity_store_;
116 }; 117 };
117 118
118 } // namespace webrtc 119 } // namespace webrtc
119 120
120 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_ 121 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698