7bcfc3b232
This reverts commit 57fb3154b5411934b80051ad827db4e54d00f381. Reason for revert: Breaks jingle_glue in chromium; need to leave candidate.h in place and include the new location until it's fixed. Original change's description: > Clean up libjingle API dependencies. > > This CL moves candidate.h into the public API, since it has > been implicitly included before. > > This is a straightforward way of solving the circular > dependencies involving that file. For instance, > libjingle_peerconnection_api includes candidate.h from > jsepicecandidate.h, but _api can't depend on rtc_p2p, which > depends on _api. In fact, _api can't depend on much at all > since it's a very high level abstraction; instead, things > should depend on it. > > Furthermore, we have the case where deprecated headers > include headers in internal modules. I just have to turn > off include checking for those, but that's not a big deal. > > This CL punts the problem of callfactoryinterface.h being > implicitly included, and pulling in most of the call > module with it. This should be addressed in a follow-up > CL. > > Bug: webrtc:7504 > Change-Id: I1b1729408158418333ccdf702bf529386090f0d7 > Reviewed-on: https://webrtc-review.googlesource.com/2020 > Commit-Queue: Patrik Höglund <phoglund@webrtc.org> > Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org> > Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20034} TBR=phoglund@webrtc.org,deadbeef@webrtc.org,solenberg@webrtc.org,perkj@webrtc.org Change-Id: Ic5c3d0cf0b8c4d48ecbc49efdb76b373e3c950a5 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7504 Reviewed-on: https://webrtc-review.googlesource.com/4702 Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20036}
94 lines
2.9 KiB
C++
94 lines
2.9 KiB
C++
/*
|
|
* Copyright 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
// TODO(deadbeef): Move this out of api/; it's an implementation detail and
|
|
// shouldn't be used externally.
|
|
|
|
#ifndef API_JSEPICECANDIDATE_H_
|
|
#define API_JSEPICECANDIDATE_H_
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "api/jsep.h"
|
|
#include "p2p/base/candidate.h"
|
|
#include "rtc_base/constructormagic.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Implementation of IceCandidateInterface.
|
|
class JsepIceCandidate : public IceCandidateInterface {
|
|
public:
|
|
JsepIceCandidate(const std::string& sdp_mid, int sdp_mline_index);
|
|
JsepIceCandidate(const std::string& sdp_mid, int sdp_mline_index,
|
|
const cricket::Candidate& candidate);
|
|
~JsepIceCandidate();
|
|
// |err| may be null.
|
|
bool Initialize(const std::string& sdp, SdpParseError* err);
|
|
void SetCandidate(const cricket::Candidate& candidate) {
|
|
candidate_ = candidate;
|
|
}
|
|
|
|
virtual std::string sdp_mid() const { return sdp_mid_; }
|
|
virtual int sdp_mline_index() const { return sdp_mline_index_; }
|
|
virtual const cricket::Candidate& candidate() const {
|
|
return candidate_;
|
|
}
|
|
|
|
virtual std::string server_url() const { return candidate_.url(); }
|
|
|
|
virtual bool ToString(std::string* out) const;
|
|
|
|
private:
|
|
std::string sdp_mid_;
|
|
int sdp_mline_index_;
|
|
cricket::Candidate candidate_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(JsepIceCandidate);
|
|
};
|
|
|
|
// Implementation of IceCandidateCollection which stores JsepIceCandidates.
|
|
class JsepCandidateCollection : public IceCandidateCollection {
|
|
public:
|
|
JsepCandidateCollection() {}
|
|
// Move constructor is defined so that a vector of JsepCandidateCollections
|
|
// can be resized.
|
|
JsepCandidateCollection(JsepCandidateCollection&& o)
|
|
: candidates_(std::move(o.candidates_)) {}
|
|
~JsepCandidateCollection();
|
|
virtual size_t count() const {
|
|
return candidates_.size();
|
|
}
|
|
virtual bool HasCandidate(const IceCandidateInterface* candidate) const;
|
|
// Adds and takes ownership of the JsepIceCandidate.
|
|
// TODO(deadbeef): Make this use an std::unique_ptr<>, so ownership logic is
|
|
// more clear.
|
|
virtual void add(JsepIceCandidate* candidate) {
|
|
candidates_.push_back(candidate);
|
|
}
|
|
virtual const IceCandidateInterface* at(size_t index) const {
|
|
return candidates_[index];
|
|
}
|
|
// Removes the candidate that has a matching address and protocol.
|
|
//
|
|
// Returns the number of candidates that were removed.
|
|
size_t remove(const cricket::Candidate& candidate);
|
|
|
|
private:
|
|
std::vector<JsepIceCandidate*> candidates_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(JsepCandidateCollection);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_JSEPICECANDIDATE_H_
|