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 1785613011: Revert of Remove candidates when doing continual gathering (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 4 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/peerconnection.cc ('k') | webrtc/api/peerconnectionproxy.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 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 return false; 432 return false;
433 } 433 }
434 // Provides a remote candidate to the ICE Agent. 434 // Provides a remote candidate to the ICE Agent.
435 // A copy of the |candidate| will be created and added to the remote 435 // A copy of the |candidate| will be created and added to the remote
436 // description. So the caller of this method still has the ownership of the 436 // description. So the caller of this method still has the ownership of the
437 // |candidate|. 437 // |candidate|.
438 // TODO(ronghuawu): Consider to change this so that the AddIceCandidate will 438 // TODO(ronghuawu): Consider to change this so that the AddIceCandidate will
439 // take the ownership of the |candidate|. 439 // take the ownership of the |candidate|.
440 virtual bool AddIceCandidate(const IceCandidateInterface* candidate) = 0; 440 virtual bool AddIceCandidate(const IceCandidateInterface* candidate) = 0;
441 441
442 // Removes a group of remote candidates from the ICE agent.
443 virtual bool RemoveIceCandidates(
444 const std::vector<cricket::Candidate>& candidates) {
445 return false;
446 }
447
448 virtual void RegisterUMAObserver(UMAObserver* observer) = 0; 442 virtual void RegisterUMAObserver(UMAObserver* observer) = 0;
449 443
450 // Returns the current SignalingState. 444 // Returns the current SignalingState.
451 virtual SignalingState signaling_state() = 0; 445 virtual SignalingState signaling_state() = 0;
452 446
453 // TODO(bemasc): Remove ice_state when callers are changed to 447 // TODO(bemasc): Remove ice_state when callers are changed to
454 // IceConnection/GatheringState. 448 // IceConnection/GatheringState.
455 // Returns the current IceState. 449 // Returns the current IceState.
456 virtual IceState ice_state() = 0; 450 virtual IceState ice_state() = 0;
457 virtual IceConnectionState ice_connection_state() = 0; 451 virtual IceConnectionState ice_connection_state() = 0;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 virtual void OnIceConnectionChange( 488 virtual void OnIceConnectionChange(
495 PeerConnectionInterface::IceConnectionState new_state) = 0; 489 PeerConnectionInterface::IceConnectionState new_state) = 0;
496 490
497 // Called any time the IceGatheringState changes 491 // Called any time the IceGatheringState changes
498 virtual void OnIceGatheringChange( 492 virtual void OnIceGatheringChange(
499 PeerConnectionInterface::IceGatheringState new_state) = 0; 493 PeerConnectionInterface::IceGatheringState new_state) = 0;
500 494
501 // New Ice candidate have been found. 495 // New Ice candidate have been found.
502 virtual void OnIceCandidate(const IceCandidateInterface* candidate) = 0; 496 virtual void OnIceCandidate(const IceCandidateInterface* candidate) = 0;
503 497
504 // Ice candidates have been removed.
505 // TODO(honghaiz): Make this a pure virtual method when all its subclasses
506 // implement it.
507 virtual void OnIceCandidatesRemoved(
508 const std::vector<cricket::Candidate>& candidates) {}
509
510 // Called when the ICE connection receiving status changes. 498 // Called when the ICE connection receiving status changes.
511 virtual void OnIceConnectionReceivingChange(bool receiving) {} 499 virtual void OnIceConnectionReceivingChange(bool receiving) {}
512 500
513 protected: 501 protected:
514 // Dtor protected as objects shouldn't be deleted via this interface. 502 // Dtor protected as objects shouldn't be deleted via this interface.
515 ~PeerConnectionObserver() {} 503 ~PeerConnectionObserver() {}
516 }; 504 };
517 505
518 // PeerConnectionFactoryInterface is the factory interface use for creating 506 // PeerConnectionFactoryInterface is the factory interface use for creating
519 // PeerConnection, MediaStream and media tracks. 507 // PeerConnection, MediaStream and media tracks.
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 CreatePeerConnectionFactory( 632 CreatePeerConnectionFactory(
645 rtc::Thread* worker_thread, 633 rtc::Thread* worker_thread,
646 rtc::Thread* signaling_thread, 634 rtc::Thread* signaling_thread,
647 AudioDeviceModule* default_adm, 635 AudioDeviceModule* default_adm,
648 cricket::WebRtcVideoEncoderFactory* encoder_factory, 636 cricket::WebRtcVideoEncoderFactory* encoder_factory,
649 cricket::WebRtcVideoDecoderFactory* decoder_factory); 637 cricket::WebRtcVideoDecoderFactory* decoder_factory);
650 638
651 } // namespace webrtc 639 } // namespace webrtc
652 640
653 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 641 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection.cc ('k') | webrtc/api/peerconnectionproxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698