Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(747)

Unified Diff: webrtc/api/jsepsessiondescription.h

Issue 2514883002: Create //webrtc/api:libjingle_peerconnection_api + refactorings. (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/api/jsepsessiondescription.h
diff --git a/webrtc/api/jsepsessiondescription.h b/webrtc/api/jsepsessiondescription.h
index 8f2ab5ff57aaa0d95d2214bcfc1b509aecfeae63..3bd621e6693d3b3af33625bf206b4684ff5bb31f 100644
--- a/webrtc/api/jsepsessiondescription.h
+++ b/webrtc/api/jsepsessiondescription.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 The WebRTC project authors. All Rights Reserved.
+ * Copyright 2015 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
@@ -8,81 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-// Implements the SessionDescriptionInterface.
-
#ifndef WEBRTC_API_JSEPSESSIONDESCRIPTION_H_
#define WEBRTC_API_JSEPSESSIONDESCRIPTION_H_
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "webrtc/api/jsep.h"
-#include "webrtc/api/jsepicecandidate.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/p2p/base/candidate.h"
-
-namespace cricket {
-class SessionDescription;
-}
-
-namespace webrtc {
-
-class JsepSessionDescription : public SessionDescriptionInterface {
- public:
- explicit JsepSessionDescription(const std::string& type);
- virtual ~JsepSessionDescription();
-
- // |error| can be NULL if don't care about the failure reason.
- bool Initialize(const std::string& sdp, SdpParseError* error);
-
- // Takes ownership of |description|.
- bool Initialize(cricket::SessionDescription* description,
noahric 2016/12/19 21:09:36 This is going to be problematic in the short term,
ossu 2016/12/20 16:22:25 I'll pick up the thread anyways, but looking at th
ossu 2016/12/20 16:29:09 Actually, no, I'll just move the jsep headers back
Taylor Brandstetter 2016/12/20 19:19:10 If this is a matter of "what API do we commit to s
- 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_;
- }
- // Allow 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
+// Including this file is deprecated. It is no longer part of the public API.
+// This only includes the file in its new location for backwards compatibility.
+#include "webrtc/pc/jsepsessiondescription.h"
#endif // WEBRTC_API_JSEPSESSIONDESCRIPTION_H_

Powered by Google App Engine
This is Rietveld 408576698