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

Side by Side Diff: webrtc/api/peerconnectioninterface.h

Issue 2224563004: Add signaling to support ICE renomination. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Update comments and merge Created 4 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 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 bool enable_rtp_data_channel = false; 298 bool enable_rtp_data_channel = false;
299 bool enable_quic = false; 299 bool enable_quic = false;
300 rtc::Optional<int> screencast_min_bitrate; 300 rtc::Optional<int> screencast_min_bitrate;
301 rtc::Optional<bool> combined_audio_video_bwe; 301 rtc::Optional<bool> combined_audio_video_bwe;
302 rtc::Optional<bool> enable_dtls_srtp; 302 rtc::Optional<bool> enable_dtls_srtp;
303 int ice_candidate_pool_size = 0; 303 int ice_candidate_pool_size = 0;
304 bool prune_turn_ports = false; 304 bool prune_turn_ports = false;
305 // If set to true, this means the ICE transport should presume TURN-to-TURN 305 // If set to true, this means the ICE transport should presume TURN-to-TURN
306 // candidate pairs will succeed, even before a binding response is received. 306 // candidate pairs will succeed, even before a binding response is received.
307 bool presume_writable_when_fully_relayed = false; 307 bool presume_writable_when_fully_relayed = false;
308
309 bool ice_renomination = false;
Taylor Brandstetter 2016/08/17 22:02:00 nit: Could add comment explaining that this contro
honghaiz3 2016/08/19 18:42:01 Done.
308 }; 310 };
309 311
310 struct RTCOfferAnswerOptions { 312 struct RTCOfferAnswerOptions {
311 static const int kUndefined = -1; 313 static const int kUndefined = -1;
312 static const int kMaxOfferToReceiveMedia = 1; 314 static const int kMaxOfferToReceiveMedia = 1;
313 315
314 // The default value for constraint offerToReceiveX:true. 316 // The default value for constraint offerToReceiveX:true.
315 static const int kOfferToReceiveMediaTrue = 1; 317 static const int kOfferToReceiveMediaTrue = 1;
316 318
317 int offer_to_receive_video; 319 int offer_to_receive_video = kUndefined;
318 int offer_to_receive_audio; 320 int offer_to_receive_audio = kUndefined;
319 bool voice_activity_detection; 321 bool voice_activity_detection = true;
320 bool ice_restart; 322 bool ice_restart = false;
321 bool use_rtp_mux; 323 bool use_rtp_mux = true;
322 324
323 RTCOfferAnswerOptions() 325 RTCOfferAnswerOptions() = default;
324 : offer_to_receive_video(kUndefined),
325 offer_to_receive_audio(kUndefined),
326 voice_activity_detection(true),
327 ice_restart(false),
328 use_rtp_mux(true) {}
329 326
330 RTCOfferAnswerOptions(int offer_to_receive_video, 327 RTCOfferAnswerOptions(int offer_to_receive_video,
331 int offer_to_receive_audio, 328 int offer_to_receive_audio,
332 bool voice_activity_detection, 329 bool voice_activity_detection,
333 bool ice_restart, 330 bool ice_restart,
334 bool use_rtp_mux) 331 bool use_rtp_mux)
335 : offer_to_receive_video(offer_to_receive_video), 332 : offer_to_receive_video(offer_to_receive_video),
336 offer_to_receive_audio(offer_to_receive_audio), 333 offer_to_receive_audio(offer_to_receive_audio),
337 voice_activity_detection(voice_activity_detection), 334 voice_activity_detection(voice_activity_detection),
338 ice_restart(ice_restart), 335 ice_restart(ice_restart),
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 cricket::WebRtcVideoEncoderFactory* encoder_factory, 736 cricket::WebRtcVideoEncoderFactory* encoder_factory,
740 cricket::WebRtcVideoDecoderFactory* decoder_factory) { 737 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
741 return CreatePeerConnectionFactory( 738 return CreatePeerConnectionFactory(
742 worker_and_network_thread, worker_and_network_thread, signaling_thread, 739 worker_and_network_thread, worker_and_network_thread, signaling_thread,
743 default_adm, encoder_factory, decoder_factory); 740 default_adm, encoder_factory, decoder_factory);
744 } 741 }
745 742
746 } // namespace webrtc 743 } // namespace webrtc
747 744
748 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 745 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698