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

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

Issue 1871993002: Only generate one CNAME per PeerConnection. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add unit tests in peerconnectioninterface_unittest Created 4 years, 8 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') | webrtc/api/peerconnection.cc » ('J')
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 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 UMAObserver* uma_observer_; 361 UMAObserver* uma_observer_;
362 SignalingState signaling_state_; 362 SignalingState signaling_state_;
363 // TODO(bemasc): Remove ice_state_. 363 // TODO(bemasc): Remove ice_state_.
364 IceState ice_state_; 364 IceState ice_state_;
365 IceConnectionState ice_connection_state_; 365 IceConnectionState ice_connection_state_;
366 IceGatheringState ice_gathering_state_; 366 IceGatheringState ice_gathering_state_;
367 367
368 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_; 368 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_;
369 rtc::scoped_ptr<MediaControllerInterface> media_controller_; 369 rtc::scoped_ptr<MediaControllerInterface> media_controller_;
370 370
371 // One PeerConnection has only one CNAME.
pthatcher1 2016/05/05 18:50:51 Can you add a link to where this is specified? I
Zhi Huang 2016/05/06 01:36:53 Done.
372 std::string cname_;
pthatcher1 2016/05/05 18:50:51 Can you call this rtcp_cname_? And "RTCP CNAME"
Zhi Huang 2016/05/06 01:36:53 Done.
373
371 // Streams added via AddStream. 374 // Streams added via AddStream.
372 rtc::scoped_refptr<StreamCollection> local_streams_; 375 rtc::scoped_refptr<StreamCollection> local_streams_;
373 // Streams created as a result of SetRemoteDescription. 376 // Streams created as a result of SetRemoteDescription.
374 rtc::scoped_refptr<StreamCollection> remote_streams_; 377 rtc::scoped_refptr<StreamCollection> remote_streams_;
375 378
376 std::vector<rtc::scoped_ptr<MediaStreamObserver>> stream_observers_; 379 std::vector<rtc::scoped_ptr<MediaStreamObserver>> stream_observers_;
377 380
378 // These lists store track info seen in local/remote descriptions. 381 // These lists store track info seen in local/remote descriptions.
379 TrackInfos remote_audio_tracks_; 382 TrackInfos remote_audio_tracks_;
380 TrackInfos remote_video_tracks_; 383 TrackInfos remote_video_tracks_;
(...skipping 15 matching lines...) Expand all
396 // because its destruction fires signals (such as VoiceChannelDestroyed) 399 // because its destruction fires signals (such as VoiceChannelDestroyed)
397 // which will trigger some final actions in PeerConnection... 400 // which will trigger some final actions in PeerConnection...
398 rtc::scoped_ptr<WebRtcSession> session_; 401 rtc::scoped_ptr<WebRtcSession> session_;
399 // ... But stats_ depends on session_ so it should be destroyed even earlier. 402 // ... But stats_ depends on session_ so it should be destroyed even earlier.
400 rtc::scoped_ptr<StatsCollector> stats_; 403 rtc::scoped_ptr<StatsCollector> stats_;
401 }; 404 };
402 405
403 } // namespace webrtc 406 } // namespace webrtc
404 407
405 #endif // WEBRTC_API_PEERCONNECTION_H_ 408 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/peerconnection.cc » ('j') | webrtc/api/peerconnection.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698