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

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

Issue 2290963002: Revert of Remove the obsolete enum webrtc::PeerConnectionInterface::IceState. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( 99 rtc::scoped_refptr<DataChannelInterface> CreateDataChannel(
100 const std::string& label, 100 const std::string& label,
101 const DataChannelInit* config) override; 101 const DataChannelInit* config) override;
102 bool GetStats(StatsObserver* observer, 102 bool GetStats(StatsObserver* observer,
103 webrtc::MediaStreamTrackInterface* track, 103 webrtc::MediaStreamTrackInterface* track,
104 StatsOutputLevel level) override; 104 StatsOutputLevel level) override;
105 105
106 SignalingState signaling_state() override; 106 SignalingState signaling_state() override;
107 107
108 // TODO(bemasc): Remove ice_state() when callers are removed.
109 IceState ice_state() override;
108 IceConnectionState ice_connection_state() override; 110 IceConnectionState ice_connection_state() override;
109 IceGatheringState ice_gathering_state() override; 111 IceGatheringState ice_gathering_state() override;
110 112
111 const SessionDescriptionInterface* local_description() const override; 113 const SessionDescriptionInterface* local_description() const override;
112 const SessionDescriptionInterface* remote_description() const override; 114 const SessionDescriptionInterface* remote_description() const override;
113 115
114 // JSEP01 116 // JSEP01
115 // Deprecated, use version without constraints. 117 // Deprecated, use version without constraints.
116 void CreateOffer(CreateSessionDescriptionObserver* observer, 118 void CreateOffer(CreateSessionDescriptionObserver* observer,
117 const MediaConstraintsInterface* constraints) override; 119 const MediaConstraintsInterface* constraints) override;
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 // Storing the factory as a scoped reference pointer ensures that the memory 374 // Storing the factory as a scoped reference pointer ensures that the memory
373 // in the PeerConnectionFactoryImpl remains available as long as the 375 // in the PeerConnectionFactoryImpl remains available as long as the
374 // PeerConnection is running. It is passed to PeerConnection as a raw pointer. 376 // PeerConnection is running. It is passed to PeerConnection as a raw pointer.
375 // However, since the reference counting is done in the 377 // However, since the reference counting is done in the
376 // PeerConnectionFactoryInterface all instances created using the raw pointer 378 // PeerConnectionFactoryInterface all instances created using the raw pointer
377 // will refer to the same reference count. 379 // will refer to the same reference count.
378 rtc::scoped_refptr<PeerConnectionFactory> factory_; 380 rtc::scoped_refptr<PeerConnectionFactory> factory_;
379 PeerConnectionObserver* observer_; 381 PeerConnectionObserver* observer_;
380 UMAObserver* uma_observer_; 382 UMAObserver* uma_observer_;
381 SignalingState signaling_state_; 383 SignalingState signaling_state_;
384 // TODO(bemasc): Remove ice_state_.
385 IceState ice_state_;
382 IceConnectionState ice_connection_state_; 386 IceConnectionState ice_connection_state_;
383 IceGatheringState ice_gathering_state_; 387 IceGatheringState ice_gathering_state_;
384 388
385 std::unique_ptr<cricket::PortAllocator> port_allocator_; 389 std::unique_ptr<cricket::PortAllocator> port_allocator_;
386 std::unique_ptr<MediaControllerInterface> media_controller_; 390 std::unique_ptr<MediaControllerInterface> media_controller_;
387 391
388 // One PeerConnection has only one RTCP CNAME. 392 // One PeerConnection has only one RTCP CNAME.
389 // https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26#section-4.9 393 // https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26#section-4.9
390 std::string rtcp_cname_; 394 std::string rtcp_cname_;
391 395
(...skipping 24 matching lines...) Expand all
416 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>> 420 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>>
417 receivers_; 421 receivers_;
418 422
419 std::unique_ptr<WebRtcSession> session_; 423 std::unique_ptr<WebRtcSession> session_;
420 std::unique_ptr<StatsCollector> stats_; 424 std::unique_ptr<StatsCollector> stats_;
421 }; 425 };
422 426
423 } // namespace webrtc 427 } // namespace webrtc
424 428
425 #endif // WEBRTC_API_PEERCONNECTION_H_ 429 #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