admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. Override and virtual has to be consistent.

Browse Source 
2. provide an implementation for SetIceConnectionReceivingTimeout so that Chrome does not complain.

BUG=

Review URL: https://codereview.webrtc.org/1227843006

Cr-Commit-Position: refs/heads/master@{#9574}
This commit is contained in:
honghaiz 2015-07-13 17:08:08 -07:00 committed by Commit bot
parent 6e2ce6e1ae
commit a03cd3fdef
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
talk/app/webrtc/peerconnectioninterface.h
View File

@ -336,7 +336,7 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer, virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer,
SessionDescriptionInterface* desc) = 0; SessionDescriptionInterface* desc) = 0;
// Sets the ICE connection receiving timeout value in milliseconds. // Sets the ICE connection receiving timeout value in milliseconds.
virtual void SetIceConnectionReceivingTimeout(int timeout_ms) = 0; virtual void SetIceConnectionReceivingTimeout(int timeout_ms) {}
// Restarts or updates the ICE Agent process of gathering local candidates // Restarts or updates the ICE Agent process of gathering local candidates
// and pinging remote candidates. // and pinging remote candidates.
virtual bool UpdateIce(const IceServers& configuration, virtual bool UpdateIce(const IceServers& configuration,

7
webrtc/p2p/base/p2ptransportchannel.h
View File

@ -73,6 +73,9 @@ class P2PTransportChannel : public TransportChannelImpl,
virtual void Connect(); virtual void Connect();
virtual void OnSignalingReady(); virtual void OnSignalingReady();
virtual void OnCandidate(const Candidate& candidate); virtual void OnCandidate(const Candidate& candidate);
// Sets the receiving timeout in milliseconds.
// This also sets the check_receiving_delay proportionally.
virtual void SetReceivingTimeout(int receiving_timeout_ms);
// From TransportChannel: // From TransportChannel:
virtual int SendPacket(const char *data, size_t len, virtual int SendPacket(const char *data, size_t len,
@ -85,10 +88,6 @@ class P2PTransportChannel : public TransportChannelImpl,
const Connection* best_connection() const { return best_connection_; } const Connection* best_connection() const { return best_connection_; }
void set_incoming_only(bool value) { incoming_only_ = value; } void set_incoming_only(bool value) { incoming_only_ = value; }
// Sets the receiving timeout in milliseconds.
// This also sets the check_receiving_delay proportionally.
void SetReceivingTimeout(int receiving_timeout_ms) override;
// Note: This is only for testing purpose. // Note: This is only for testing purpose.
// |ports_| should not be changed from outside. // |ports_| should not be changed from outside.
const std::vector<PortInterface*>& ports() { return ports_; } const std::vector<PortInterface*>& ports() { return ports_; }