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

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

Issue 1288033009: RTCCertificates added to RTCConfiguration, used by WebRtcSession/-DescriptionFactory (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed torbjorng's comment and merged with master 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
« no previous file with comments | « no previous file | talk/app/webrtc/test/fakedtlsidentitystore.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #include "talk/app/webrtc/datachannelinterface.h" 74 #include "talk/app/webrtc/datachannelinterface.h"
75 #include "talk/app/webrtc/dtlsidentitystore.h" 75 #include "talk/app/webrtc/dtlsidentitystore.h"
76 #include "talk/app/webrtc/dtmfsenderinterface.h" 76 #include "talk/app/webrtc/dtmfsenderinterface.h"
77 #include "talk/app/webrtc/dtlsidentitystore.h" 77 #include "talk/app/webrtc/dtlsidentitystore.h"
78 #include "talk/app/webrtc/jsep.h" 78 #include "talk/app/webrtc/jsep.h"
79 #include "talk/app/webrtc/mediastreaminterface.h" 79 #include "talk/app/webrtc/mediastreaminterface.h"
80 #include "talk/app/webrtc/statstypes.h" 80 #include "talk/app/webrtc/statstypes.h"
81 #include "talk/app/webrtc/umametrics.h" 81 #include "talk/app/webrtc/umametrics.h"
82 #include "webrtc/base/fileutils.h" 82 #include "webrtc/base/fileutils.h"
83 #include "webrtc/base/network.h" 83 #include "webrtc/base/network.h"
84 #include "webrtc/base/rtccertificate.h"
84 #include "webrtc/base/sslstreamadapter.h" 85 #include "webrtc/base/sslstreamadapter.h"
85 #include "webrtc/base/socketaddress.h" 86 #include "webrtc/base/socketaddress.h"
86 87
87 namespace rtc { 88 namespace rtc {
88 class SSLIdentity; 89 class SSLIdentity;
89 class Thread; 90 class Thread;
90 } 91 }
91 92
92 namespace cricket { 93 namespace cricket {
93 class PortAllocator; 94 class PortAllocator;
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 enum RtcpMuxPolicy { 224 enum RtcpMuxPolicy {
224 kRtcpMuxPolicyNegotiate, 225 kRtcpMuxPolicyNegotiate,
225 kRtcpMuxPolicyRequire, 226 kRtcpMuxPolicyRequire,
226 }; 227 };
227 228
228 enum TcpCandidatePolicy { 229 enum TcpCandidatePolicy {
229 kTcpCandidatePolicyEnabled, 230 kTcpCandidatePolicyEnabled,
230 kTcpCandidatePolicyDisabled 231 kTcpCandidatePolicyDisabled
231 }; 232 };
232 233
234 // TODO(hbos): Change into class with private data and public getters.
233 struct RTCConfiguration { 235 struct RTCConfiguration {
234 // TODO(pthatcher): Rename this ice_transport_type, but update 236 // TODO(pthatcher): Rename this ice_transport_type, but update
235 // Chromium at the same time. 237 // Chromium at the same time.
236 IceTransportsType type; 238 IceTransportsType type;
237 // TODO(pthatcher): Rename this ice_servers, but update Chromium 239 // TODO(pthatcher): Rename this ice_servers, but update Chromium
238 // at the same time. 240 // at the same time.
239 IceServers servers; 241 IceServers servers;
240 // A localhost candidate is signaled whenever a candidate with the any 242 // A localhost candidate is signaled whenever a candidate with the any
241 // address is allocated. 243 // address is allocated.
242 bool enable_localhost_ice_candidate; 244 bool enable_localhost_ice_candidate;
243 BundlePolicy bundle_policy; 245 BundlePolicy bundle_policy;
244 RtcpMuxPolicy rtcp_mux_policy; 246 RtcpMuxPolicy rtcp_mux_policy;
245 TcpCandidatePolicy tcp_candidate_policy; 247 TcpCandidatePolicy tcp_candidate_policy;
246 int audio_jitter_buffer_max_packets; 248 int audio_jitter_buffer_max_packets;
247 bool audio_jitter_buffer_fast_accelerate; 249 bool audio_jitter_buffer_fast_accelerate;
250 std::vector<rtc::scoped_refptr<rtc::RTCCertificate>> certificates;
248 251
249 RTCConfiguration() 252 RTCConfiguration()
250 : type(kAll), 253 : type(kAll),
251 enable_localhost_ice_candidate(false), 254 enable_localhost_ice_candidate(false),
252 bundle_policy(kBundlePolicyBalanced), 255 bundle_policy(kBundlePolicyBalanced),
253 rtcp_mux_policy(kRtcpMuxPolicyNegotiate), 256 rtcp_mux_policy(kRtcpMuxPolicyNegotiate),
254 tcp_candidate_policy(kTcpCandidatePolicyEnabled), 257 tcp_candidate_policy(kTcpCandidatePolicyEnabled),
255 audio_jitter_buffer_max_packets(50), 258 audio_jitter_buffer_max_packets(50),
256 audio_jitter_buffer_fast_accelerate(false) {} 259 audio_jitter_buffer_fast_accelerate(false) {}
257 }; 260 };
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 CreatePeerConnectionFactory( 601 CreatePeerConnectionFactory(
599 rtc::Thread* worker_thread, 602 rtc::Thread* worker_thread,
600 rtc::Thread* signaling_thread, 603 rtc::Thread* signaling_thread,
601 AudioDeviceModule* default_adm, 604 AudioDeviceModule* default_adm,
602 cricket::WebRtcVideoEncoderFactory* encoder_factory, 605 cricket::WebRtcVideoEncoderFactory* encoder_factory,
603 cricket::WebRtcVideoDecoderFactory* decoder_factory); 606 cricket::WebRtcVideoDecoderFactory* decoder_factory);
604 607
605 } // namespace webrtc 608 } // namespace webrtc
606 609
607 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ 610 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « no previous file | talk/app/webrtc/test/fakedtlsidentitystore.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698