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

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: Merge with head 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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 bool presume_writable_when_fully_relayed = false; 307 bool presume_writable_when_fully_relayed = false;
308 }; 308 };
309 309
310 struct RTCOfferAnswerOptions { 310 struct RTCOfferAnswerOptions {
311 static const int kUndefined = -1; 311 static const int kUndefined = -1;
312 static const int kMaxOfferToReceiveMedia = 1; 312 static const int kMaxOfferToReceiveMedia = 1;
313 313
314 // The default value for constraint offerToReceiveX:true. 314 // The default value for constraint offerToReceiveX:true.
315 static const int kOfferToReceiveMediaTrue = 1; 315 static const int kOfferToReceiveMediaTrue = 1;
316 316
317 int offer_to_receive_video; 317 int offer_to_receive_video = kUndefined;
318 int offer_to_receive_audio; 318 int offer_to_receive_audio = kUndefined;
319 bool voice_activity_detection; 319 bool voice_activity_detection = true;
320 bool ice_restart; 320 bool ice_restart = false;
321 bool use_rtp_mux; 321 bool ice_renomination = false;
pthatcher1 2016/08/17 17:25:46 It seems so much easier to just put this in RTCCon
honghaiz3 2016/08/17 20:21:48 Done.
322 bool use_rtp_mux = true;
322 323
323 RTCOfferAnswerOptions() 324 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 325
330 RTCOfferAnswerOptions(int offer_to_receive_video, 326 RTCOfferAnswerOptions(int offer_to_receive_video,
331 int offer_to_receive_audio, 327 int offer_to_receive_audio,
332 bool voice_activity_detection, 328 bool voice_activity_detection,
333 bool ice_restart, 329 bool ice_restart,
334 bool use_rtp_mux) 330 bool use_rtp_mux)
335 : offer_to_receive_video(offer_to_receive_video), 331 : offer_to_receive_video(offer_to_receive_video),
336 offer_to_receive_audio(offer_to_receive_audio), 332 offer_to_receive_audio(offer_to_receive_audio),
337 voice_activity_detection(voice_activity_detection), 333 voice_activity_detection(voice_activity_detection),
338 ice_restart(ice_restart), 334 ice_restart(ice_restart),
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 cricket::WebRtcVideoEncoderFactory* encoder_factory, 735 cricket::WebRtcVideoEncoderFactory* encoder_factory,
740 cricket::WebRtcVideoDecoderFactory* decoder_factory) { 736 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
741 return CreatePeerConnectionFactory( 737 return CreatePeerConnectionFactory(
742 worker_and_network_thread, worker_and_network_thread, signaling_thread, 738 worker_and_network_thread, worker_and_network_thread, signaling_thread,
743 default_adm, encoder_factory, decoder_factory); 739 default_adm, encoder_factory, decoder_factory);
744 } 740 }
745 741
746 } // namespace webrtc 742 } // namespace webrtc
747 743
748 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 744 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698