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

Delete a method that was not used.

Browse Source 
This was a mistake from code merging.

BUG=
R=pthatcher@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#13301}
This commit is contained in:
Honghai Zhang 2016-06-27 11:19:24 -07:00
parent 3d2e853f86
commit 56ce49d710
2 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
webrtc/p2p/base/p2ptransportchannel.cc
View File

@ -1092,40 +1092,6 @@ bool P2PTransportChannel::PresumedWritable(const Connection* conn) const {
conn->remote_candidate().type() == PRFLX_PORT_TYPE));
}
// Determines whether we should switch between two connections, based first on
// connection states, static preferences, and then (if those are equal) on
// latency estimates.
bool P2PTransportChannel::ShouldSwitchSelectedConnection(
const Connection* selected,
const Connection* conn) const {
if (selected == conn) {
return false;
}
if (!selected || !conn) { // don't think the latter should happen
return true;
}
// We prefer to switch to a writable and receiving connection over a
// non-writable or non-receiving connection, even if the latter has
// been nominated by the controlling side.
int state_cmp = CompareConnectionStates(selected, conn);
if (state_cmp != 0) {
return state_cmp < 0;
}
if (ice_role_ == ICEROLE_CONTROLLED && selected->nominated()) {
LOG(LS_VERBOSE) << "Controlled side did not switch due to nominated status";
return false;
}
int prefs_cmp = CompareConnectionCandidates(selected, conn);
if (prefs_cmp != 0) {
return prefs_cmp < 0;
}
return selected->rtt() - conn->rtt() >= kMinImprovement;
}
// Sort the available connections to find the best one. We also monitor
// the number of available connections and the current state.
void P2PTransportChannel::SortConnections() {

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

@ -231,8 +231,6 @@ class P2PTransportChannel : public TransportChannelImpl,
bool PresumedWritable(const cricket::Connection* conn) const;
bool ShouldSwitchSelectedConnection(const cricket::Connection* selected,
const cricket::Connection* conn) const;
void SortConnections();
void SwitchSelectedConnection(Connection* conn);
void UpdateState();