| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 // Implements the SessionDescriptionInterface. | 11 // Implements the SessionDescriptionInterface. |
| 12 | 12 |
| 13 #ifndef WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ | 13 #ifndef WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ |
| 14 #define WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ | 14 #define WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ |
| 15 | 15 |
| 16 #include <memory> |
| 16 #include <string> | 17 #include <string> |
| 17 #include <vector> | 18 #include <vector> |
| 18 | 19 |
| 19 #include "webrtc/api/jsep.h" | 20 #include "webrtc/api/jsep.h" |
| 20 #include "webrtc/api/jsepicecandidate.h" | 21 #include "webrtc/api/jsepicecandidate.h" |
| 21 #include "webrtc/base/constructormagic.h" | 22 #include "webrtc/base/constructormagic.h" |
| 22 #include "webrtc/base/scoped_ptr.h" | 23 #include "webrtc/base/scoped_ptr.h" |
| 23 #include "webrtc/p2p/base/candidate.h" | 24 #include "webrtc/p2p/base/candidate.h" |
| 24 | 25 |
| 25 namespace cricket { | 26 namespace cricket { |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 | 69 |
| 69 // Default video encoder settings. The resolution is the max resolution. | 70 // Default video encoder settings. The resolution is the max resolution. |
| 70 // TODO(perkj): Implement proper negotiation of video resolution. | 71 // TODO(perkj): Implement proper negotiation of video resolution. |
| 71 static const int kDefaultVideoCodecId; | 72 static const int kDefaultVideoCodecId; |
| 72 static const int kDefaultVideoCodecFramerate; | 73 static const int kDefaultVideoCodecFramerate; |
| 73 static const char kDefaultVideoCodecName[]; | 74 static const char kDefaultVideoCodecName[]; |
| 74 static const int kMaxVideoCodecWidth; | 75 static const int kMaxVideoCodecWidth; |
| 75 static const int kMaxVideoCodecHeight; | 76 static const int kMaxVideoCodecHeight; |
| 76 | 77 |
| 77 private: | 78 private: |
| 78 rtc::scoped_ptr<cricket::SessionDescription> description_; | 79 std::unique_ptr<cricket::SessionDescription> description_; |
| 79 std::string session_id_; | 80 std::string session_id_; |
| 80 std::string session_version_; | 81 std::string session_version_; |
| 81 std::string type_; | 82 std::string type_; |
| 82 std::vector<JsepCandidateCollection> candidate_collection_; | 83 std::vector<JsepCandidateCollection> candidate_collection_; |
| 83 | 84 |
| 84 bool GetMediasectionIndex(const IceCandidateInterface* candidate, | 85 bool GetMediasectionIndex(const IceCandidateInterface* candidate, |
| 85 size_t* index); | 86 size_t* index); |
| 86 int GetMediasectionIndex(const cricket::Candidate& candidate); | 87 int GetMediasectionIndex(const cricket::Candidate& candidate); |
| 87 | 88 |
| 88 RTC_DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription); | 89 RTC_DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription); |
| 89 }; | 90 }; |
| 90 | 91 |
| 91 } // namespace webrtc | 92 } // namespace webrtc |
| 92 | 93 |
| 93 #endif // WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ | 94 #endif // WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ |
| OLD | NEW |