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

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

Issue 1299333003: Relanding Generate localhost candidate when no STUN/TURN and portallocator has the right flag spefi… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: 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/webrtcsession.cc » ('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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 kTcpCandidatePolicyDisabled 230 kTcpCandidatePolicyDisabled
231 }; 231 };
232 232
233 struct RTCConfiguration { 233 struct RTCConfiguration {
234 // TODO(pthatcher): Rename this ice_transport_type, but update 234 // TODO(pthatcher): Rename this ice_transport_type, but update
235 // Chromium at the same time. 235 // Chromium at the same time.
236 IceTransportsType type; 236 IceTransportsType type;
237 // TODO(pthatcher): Rename this ice_servers, but update Chromium 237 // TODO(pthatcher): Rename this ice_servers, but update Chromium
238 // at the same time. 238 // at the same time.
239 IceServers servers; 239 IceServers servers;
240 // A localhost candidate is signaled whenever a candidate with the any
241 // address is allocated.
242 bool enable_localhost_ice_candidate;
240 BundlePolicy bundle_policy; 243 BundlePolicy bundle_policy;
241 RtcpMuxPolicy rtcp_mux_policy; 244 RtcpMuxPolicy rtcp_mux_policy;
242 TcpCandidatePolicy tcp_candidate_policy; 245 TcpCandidatePolicy tcp_candidate_policy;
243 int audio_jitter_buffer_max_packets; 246 int audio_jitter_buffer_max_packets;
244 bool audio_jitter_buffer_fast_accelerate; 247 bool audio_jitter_buffer_fast_accelerate;
245 248
246 RTCConfiguration() 249 RTCConfiguration()
247 : type(kAll), 250 : type(kAll),
251 enable_localhost_ice_candidate(false),
248 bundle_policy(kBundlePolicyBalanced), 252 bundle_policy(kBundlePolicyBalanced),
249 rtcp_mux_policy(kRtcpMuxPolicyNegotiate), 253 rtcp_mux_policy(kRtcpMuxPolicyNegotiate),
250 tcp_candidate_policy(kTcpCandidatePolicyEnabled), 254 tcp_candidate_policy(kTcpCandidatePolicyEnabled),
251 audio_jitter_buffer_max_packets(50), 255 audio_jitter_buffer_max_packets(50),
252 audio_jitter_buffer_fast_accelerate(false) {} 256 audio_jitter_buffer_fast_accelerate(false) {}
253 }; 257 };
254 258
255 struct RTCOfferAnswerOptions { 259 struct RTCOfferAnswerOptions {
256 static const int kUndefined = -1; 260 static const int kUndefined = -1;
257 static const int kMaxOfferToReceiveMedia = 1; 261 static const int kMaxOfferToReceiveMedia = 1;
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 CreatePeerConnectionFactory( 598 CreatePeerConnectionFactory(
595 rtc::Thread* worker_thread, 599 rtc::Thread* worker_thread,
596 rtc::Thread* signaling_thread, 600 rtc::Thread* signaling_thread,
597 AudioDeviceModule* default_adm, 601 AudioDeviceModule* default_adm,
598 cricket::WebRtcVideoEncoderFactory* encoder_factory, 602 cricket::WebRtcVideoEncoderFactory* encoder_factory,
599 cricket::WebRtcVideoDecoderFactory* decoder_factory); 603 cricket::WebRtcVideoDecoderFactory* decoder_factory);
600 604
601 } // namespace webrtc 605 } // namespace webrtc
602 606
603 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ 607 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « no previous file | talk/app/webrtc/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698