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

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

Issue 2224563004: Add signaling to support ICE renomination. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Merge Created 4 years, 3 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 | webrtc/api/peerconnection.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 * 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 // Returns a MediaSessionOptions struct with options decided by 232 // Returns a MediaSessionOptions struct with options decided by
233 // |constraints|, the local MediaStreams and DataChannels. 233 // |constraints|, the local MediaStreams and DataChannels.
234 // Deprecated, use version without constraints. 234 // Deprecated, use version without constraints.
235 virtual bool GetOptionsForAnswer( 235 virtual bool GetOptionsForAnswer(
236 const MediaConstraintsInterface* constraints, 236 const MediaConstraintsInterface* constraints,
237 cricket::MediaSessionOptions* session_options); 237 cricket::MediaSessionOptions* session_options);
238 virtual bool GetOptionsForAnswer( 238 virtual bool GetOptionsForAnswer(
239 const RTCOfferAnswerOptions& options, 239 const RTCOfferAnswerOptions& options,
240 cricket::MediaSessionOptions* session_options); 240 cricket::MediaSessionOptions* session_options);
241 241
242 void InitializeOptionsForAnswer(
243 cricket::MediaSessionOptions* session_options);
244
242 // Helper function for options processing. 245 // Helper function for options processing.
243 // Deprecated. 246 // Deprecated.
244 virtual void FinishOptionsForAnswer( 247 virtual void FinishOptionsForAnswer(
245 cricket::MediaSessionOptions* session_options); 248 cricket::MediaSessionOptions* session_options);
246 249
247 // Remove all local and remote tracks of type |media_type|. 250 // Remove all local and remote tracks of type |media_type|.
248 // Called when a media type is rejected (m-line set to port 0). 251 // Called when a media type is rejected (m-line set to port 0).
249 void RemoveTracks(cricket::MediaType media_type); 252 void RemoveTracks(cricket::MediaType media_type);
250 253
251 // Makes sure a MediaStreamTrack is created for each StreamParam in |streams|, 254 // Makes sure a MediaStreamTrack is created for each StreamParam in |streams|,
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 TrackInfos local_video_tracks_; 410 TrackInfos local_video_tracks_;
408 411
409 SctpSidAllocator sid_allocator_; 412 SctpSidAllocator sid_allocator_;
410 // label -> DataChannel 413 // label -> DataChannel
411 std::map<std::string, rtc::scoped_refptr<DataChannel>> rtp_data_channels_; 414 std::map<std::string, rtc::scoped_refptr<DataChannel>> rtp_data_channels_;
412 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_; 415 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_;
413 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_to_free_; 416 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_to_free_;
414 417
415 bool remote_peer_supports_msid_ = false; 418 bool remote_peer_supports_msid_ = false;
416 419
420 bool enable_ice_renomination_ = false;
421
417 std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>> 422 std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>>
418 senders_; 423 senders_;
419 std::vector< 424 std::vector<
420 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>> 425 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>>
421 receivers_; 426 receivers_;
422 427
423 std::unique_ptr<WebRtcSession> session_; 428 std::unique_ptr<WebRtcSession> session_;
424 std::unique_ptr<StatsCollector> stats_; 429 std::unique_ptr<StatsCollector> stats_;
425 }; 430 };
426 431
427 } // namespace webrtc 432 } // namespace webrtc
428 433
429 #endif // WEBRTC_API_PEERCONNECTION_H_ 434 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698