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

Side by Side Diff: talk/app/webrtc/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: Updates after feedback from Peter Created 5 years 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 class BasicPacketSocketFactory; 44 class BasicPacketSocketFactory;
45 } 45 }
46 46
47 namespace webrtc { 47 namespace webrtc {
48 48
49 typedef rtc::RefCountedObject<DtlsIdentityStoreImpl> 49 typedef rtc::RefCountedObject<DtlsIdentityStoreImpl>
50 RefCountedDtlsIdentityStore; 50 RefCountedDtlsIdentityStore;
51 51
52 class PeerConnectionFactory : public PeerConnectionFactoryInterface { 52 class PeerConnectionFactory : public PeerConnectionFactoryInterface {
53 public: 53 public:
54 virtual void SetOptions(const Options& options) { 54 void SetOptions(const Options& options) override;
55 options_ = options;
56 }
57 55
58 // webrtc::PeerConnectionFactoryInterface override; 56 // webrtc::PeerConnectionFactoryInterface override;
59 // TODO(deadbeef): Get rid of this overload once clients are moved to the 57 // TODO(deadbeef): Get rid of this overload once clients are moved to the
60 // new version. 58 // new version.
61 rtc::scoped_refptr<PeerConnectionInterface> 59 rtc::scoped_refptr<PeerConnectionInterface>
62 CreatePeerConnection( 60 CreatePeerConnection(
63 const PeerConnectionInterface::RTCConfiguration& configuration, 61 const PeerConnectionInterface::RTCConfiguration& configuration,
64 const MediaConstraintsInterface* constraints, 62 const MediaConstraintsInterface* constraints,
65 PortAllocatorFactoryInterface* allocator_factory, 63 PortAllocatorFactoryInterface* allocator_factory,
66 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 64 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 video_decoder_factory_; 133 video_decoder_factory_;
136 rtc::scoped_ptr<rtc::BasicNetworkManager> default_network_manager_; 134 rtc::scoped_ptr<rtc::BasicNetworkManager> default_network_manager_;
137 rtc::scoped_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 135 rtc::scoped_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
138 136
139 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; 137 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_;
140 }; 138 };
141 139
142 } // namespace webrtc 140 } // namespace webrtc
143 141
144 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_ 142 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698