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

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

Issue 1288843003: Revert "Generate localhost candidate when no STUN/TURN and portallocator has the right flag spefied… (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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 kTcpCandidatePolicyDisabled 216 kTcpCandidatePolicyDisabled
217 }; 217 };
218 218
219 struct RTCConfiguration { 219 struct RTCConfiguration {
220 // TODO(pthatcher): Rename this ice_transport_type, but update 220 // TODO(pthatcher): Rename this ice_transport_type, but update
221 // Chromium at the same time. 221 // Chromium at the same time.
222 IceTransportsType type; 222 IceTransportsType type;
223 // TODO(pthatcher): Rename this ice_servers, but update Chromium 223 // TODO(pthatcher): Rename this ice_servers, but update Chromium
224 // at the same time. 224 // at the same time.
225 IceServers servers; 225 IceServers servers;
226 // A localhost candidate is signaled whenever a candidate with the any
227 // address is allocated.
228 bool enable_localhost_ice_candidate;
229 BundlePolicy bundle_policy; 226 BundlePolicy bundle_policy;
230 RtcpMuxPolicy rtcp_mux_policy; 227 RtcpMuxPolicy rtcp_mux_policy;
231 TcpCandidatePolicy tcp_candidate_policy; 228 TcpCandidatePolicy tcp_candidate_policy;
232 int audio_jitter_buffer_max_packets; 229 int audio_jitter_buffer_max_packets;
233 bool audio_jitter_buffer_fast_accelerate; 230 bool audio_jitter_buffer_fast_accelerate;
234 231
235 RTCConfiguration() 232 RTCConfiguration()
236 : type(kAll), 233 : type(kAll),
237 enable_localhost_ice_candidate(false),
238 bundle_policy(kBundlePolicyBalanced), 234 bundle_policy(kBundlePolicyBalanced),
239 rtcp_mux_policy(kRtcpMuxPolicyNegotiate), 235 rtcp_mux_policy(kRtcpMuxPolicyNegotiate),
240 tcp_candidate_policy(kTcpCandidatePolicyEnabled), 236 tcp_candidate_policy(kTcpCandidatePolicyEnabled),
241 audio_jitter_buffer_max_packets(50), 237 audio_jitter_buffer_max_packets(50),
242 audio_jitter_buffer_fast_accelerate(false) {} 238 audio_jitter_buffer_fast_accelerate(false) {}
243 }; 239 };
244 240
245 struct RTCOfferAnswerOptions { 241 struct RTCOfferAnswerOptions {
246 static const int kUndefined = -1; 242 static const int kUndefined = -1;
247 static const int kMaxOfferToReceiveMedia = 1; 243 static const int kMaxOfferToReceiveMedia = 1;
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 CreatePeerConnectionFactory( 580 CreatePeerConnectionFactory(
585 rtc::Thread* worker_thread, 581 rtc::Thread* worker_thread,
586 rtc::Thread* signaling_thread, 582 rtc::Thread* signaling_thread,
587 AudioDeviceModule* default_adm, 583 AudioDeviceModule* default_adm,
588 cricket::WebRtcVideoEncoderFactory* encoder_factory, 584 cricket::WebRtcVideoEncoderFactory* encoder_factory,
589 cricket::WebRtcVideoDecoderFactory* decoder_factory); 585 cricket::WebRtcVideoDecoderFactory* decoder_factory);
590 586
591 } // namespace webrtc 587 } // namespace webrtc
592 588
593 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ 589 #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