5117b04787
This is a reland of 57fb3154b5411934b80051ad827db4e54d00f381 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} Bug: webrtc:7504 Change-Id: I74aeeff678a4ce6482d2f402493ae13e698f1390 Reviewed-on: https://webrtc-review.googlesource.com/4703 Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20062}
90 lines
2.7 KiB
C++
90 lines
2.7 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_JSEPSESSIONDESCRIPTION_H_
|
|
#define API_JSEPSESSIONDESCRIPTION_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "api/candidate.h"
|
|
#include "api/jsep.h"
|
|
#include "api/jsepicecandidate.h"
|
|
#include "rtc_base/constructormagic.h"
|
|
|
|
namespace cricket {
|
|
class SessionDescription;
|
|
}
|
|
|
|
namespace webrtc {
|
|
|
|
// Implementation of SessionDescriptionInterface.
|
|
class JsepSessionDescription : public SessionDescriptionInterface {
|
|
public:
|
|
explicit JsepSessionDescription(const std::string& type);
|
|
virtual ~JsepSessionDescription();
|
|
|
|
// Takes ownership of |description|.
|
|
// TODO(deadbeef): Make this use an std::unique_ptr<>, so ownership logic is
|
|
// more clear.
|
|
bool Initialize(cricket::SessionDescription* description,
|
|
const std::string& session_id,
|
|
const std::string& session_version);
|
|
|
|
virtual cricket::SessionDescription* description() {
|
|
return description_.get();
|
|
}
|
|
virtual const cricket::SessionDescription* description() const {
|
|
return description_.get();
|
|
}
|
|
virtual std::string session_id() const {
|
|
return session_id_;
|
|
}
|
|
virtual std::string session_version() const {
|
|
return session_version_;
|
|
}
|
|
virtual std::string type() const {
|
|
return type_;
|
|
}
|
|
// Allows changing the type. Used for testing.
|
|
void set_type(const std::string& type) { type_ = type; }
|
|
virtual bool AddCandidate(const IceCandidateInterface* candidate);
|
|
virtual size_t RemoveCandidates(
|
|
const std::vector<cricket::Candidate>& candidates);
|
|
virtual size_t number_of_mediasections() const;
|
|
virtual const IceCandidateCollection* candidates(
|
|
size_t mediasection_index) const;
|
|
virtual bool ToString(std::string* out) const;
|
|
|
|
static const int kDefaultVideoCodecId;
|
|
static const char kDefaultVideoCodecName[];
|
|
|
|
private:
|
|
std::unique_ptr<cricket::SessionDescription> description_;
|
|
std::string session_id_;
|
|
std::string session_version_;
|
|
std::string type_;
|
|
std::vector<JsepCandidateCollection> candidate_collection_;
|
|
|
|
bool GetMediasectionIndex(const IceCandidateInterface* candidate,
|
|
size_t* index);
|
|
int GetMediasectionIndex(const cricket::Candidate& candidate);
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_JSEPSESSIONDESCRIPTION_H_
|