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

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

Issue 2748253003: Pass ownership of candidate to PeerConnection::OnIceCandidate (Closed)
Patch Set: Remove old "OnIceCandidate" and "using" workarounds. Created 3 years, 9 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 | « webrtc/api/jsepicecandidate.h ('k') | webrtc/examples/peerconnection/client/conductor.h » ('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 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 // seconds, not 30, and this actually represents a combination ICE + DTLS 794 // seconds, not 30, and this actually represents a combination ICE + DTLS
795 // state, so it may be "failed" if DTLS fails while ICE succeeds. 795 // state, so it may be "failed" if DTLS fails while ICE succeeds.
796 virtual void OnIceConnectionChange( 796 virtual void OnIceConnectionChange(
797 PeerConnectionInterface::IceConnectionState new_state) = 0; 797 PeerConnectionInterface::IceConnectionState new_state) = 0;
798 798
799 // Called any time the IceGatheringState changes. 799 // Called any time the IceGatheringState changes.
800 virtual void OnIceGatheringChange( 800 virtual void OnIceGatheringChange(
801 PeerConnectionInterface::IceGatheringState new_state) = 0; 801 PeerConnectionInterface::IceGatheringState new_state) = 0;
802 802
803 // A new ICE candidate has been gathered. 803 // A new ICE candidate has been gathered.
804 virtual void OnIceCandidate(const IceCandidateInterface* candidate) = 0; 804 virtual void OnIceCandidate(
joachim 2017/03/19 22:32:22 The better solution would be to keep the old versi
805 rtc::scoped_refptr<IceCandidateInterface> candidate) = 0;
805 806
806 // Ice candidates have been removed. 807 // Ice candidates have been removed.
807 // TODO(honghaiz): Make this a pure virtual method when all its subclasses 808 // TODO(honghaiz): Make this a pure virtual method when all its subclasses
808 // implement it. 809 // implement it.
809 virtual void OnIceCandidatesRemoved( 810 virtual void OnIceCandidatesRemoved(
810 const std::vector<cricket::Candidate>& candidates) {} 811 const std::vector<cricket::Candidate>& candidates) {}
811 812
812 // Called when the ICE connection receiving status changes. 813 // Called when the ICE connection receiving status changes.
813 virtual void OnIceConnectionReceivingChange(bool receiving) {} 814 virtual void OnIceConnectionReceivingChange(bool receiving) {}
814 815
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 cricket::WebRtcVideoEncoderFactory* encoder_factory, 1097 cricket::WebRtcVideoEncoderFactory* encoder_factory,
1097 cricket::WebRtcVideoDecoderFactory* decoder_factory) { 1098 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
1098 return CreatePeerConnectionFactory( 1099 return CreatePeerConnectionFactory(
1099 worker_and_network_thread, worker_and_network_thread, signaling_thread, 1100 worker_and_network_thread, worker_and_network_thread, signaling_thread,
1100 default_adm, encoder_factory, decoder_factory); 1101 default_adm, encoder_factory, decoder_factory);
1101 } 1102 }
1102 1103
1103 } // namespace webrtc 1104 } // namespace webrtc
1104 1105
1105 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 1106 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « webrtc/api/jsepicecandidate.h ('k') | webrtc/examples/peerconnection/client/conductor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698