Bug 1248637: Prune duplicate CANCELLED candidate pairs. r=drno

MozReview-Commit-ID: HeErN7xMxbQ

--HG--
extra : rebase_source : d8f355e6cc74c73c3e9bc100a2bb2b2603931e55
This commit is contained in:
Byron Campen [:bwc] 2016-03-01 10:47:14 -06:00
parent eef76e0406
commit 736356238e

View File

@ -343,7 +343,9 @@ nsresult NrIceMediaStream::GetCandidatePairs(std::vector<NrIceCandidatePair>*
!(p1->peer_nominated || p1->nominated)) ||
(p2->priority > p1->priority) ||
((p2->state == NR_ICE_PAIR_STATE_SUCCEEDED) &&
(p1->state != NR_ICE_PAIR_STATE_SUCCEEDED))
(p1->state != NR_ICE_PAIR_STATE_SUCCEEDED)) ||
((p2->state != NR_ICE_PAIR_STATE_CANCELLED) &&
(p1->state == NR_ICE_PAIR_STATE_CANCELLED))
) {
/* p2 is a better pair. */
break;