| 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 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 } | 50 } |
| 51 virtual std::string session_version() const { | 51 virtual std::string session_version() const { |
| 52 return session_version_; | 52 return session_version_; |
| 53 } | 53 } |
| 54 virtual std::string type() const { | 54 virtual std::string type() const { |
| 55 return type_; | 55 return type_; |
| 56 } | 56 } |
| 57 // Allow changing the type. Used for testing. | 57 // Allow changing the type. Used for testing. |
| 58 void set_type(const std::string& type) { type_ = type; } | 58 void set_type(const std::string& type) { type_ = type; } |
| 59 virtual bool AddCandidate(const IceCandidateInterface* candidate); | 59 virtual bool AddCandidate(const IceCandidateInterface* candidate); |
| 60 virtual int RemoveCandidates( |
| 61 const std::vector<IceCandidateInterfaceRefPtr>& candidates); |
| 60 virtual size_t number_of_mediasections() const; | 62 virtual size_t number_of_mediasections() const; |
| 61 virtual const IceCandidateCollection* candidates( | 63 virtual const IceCandidateCollection* candidates( |
| 62 size_t mediasection_index) const; | 64 size_t mediasection_index) const; |
| 63 virtual bool ToString(std::string* out) const; | 65 virtual bool ToString(std::string* out) const; |
| 64 | 66 |
| 65 // Default video encoder settings. The resolution is the max resolution. | 67 // Default video encoder settings. The resolution is the max resolution. |
| 66 // TODO(perkj): Implement proper negotiation of video resolution. | 68 // TODO(perkj): Implement proper negotiation of video resolution. |
| 67 static const int kDefaultVideoCodecId; | 69 static const int kDefaultVideoCodecId; |
| 68 static const int kDefaultVideoCodecFramerate; | 70 static const int kDefaultVideoCodecFramerate; |
| 69 static const char kDefaultVideoCodecName[]; | 71 static const char kDefaultVideoCodecName[]; |
| 70 static const int kMaxVideoCodecWidth; | 72 static const int kMaxVideoCodecWidth; |
| 71 static const int kMaxVideoCodecHeight; | 73 static const int kMaxVideoCodecHeight; |
| 72 static const int kDefaultVideoCodecPreference; | 74 static const int kDefaultVideoCodecPreference; |
| 73 | 75 |
| 74 private: | 76 private: |
| 77 int RemoveCandidate(const IceCandidateInterface* candidate); |
| 78 |
| 75 rtc::scoped_ptr<cricket::SessionDescription> description_; | 79 rtc::scoped_ptr<cricket::SessionDescription> description_; |
| 76 std::string session_id_; | 80 std::string session_id_; |
| 77 std::string session_version_; | 81 std::string session_version_; |
| 78 std::string type_; | 82 std::string type_; |
| 79 std::vector<JsepCandidateCollection> candidate_collection_; | 83 std::vector<JsepCandidateCollection> candidate_collection_; |
| 80 | 84 |
| 81 bool GetMediasectionIndex(const IceCandidateInterface* candidate, | 85 bool GetMediasectionIndex(const IceCandidateInterface* candidate, |
| 82 size_t* index); | 86 size_t* index); |
| 83 | 87 |
| 84 RTC_DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription); | 88 RTC_DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription); |
| 85 }; | 89 }; |
| 86 | 90 |
| 87 } // namespace webrtc | 91 } // namespace webrtc |
| 88 | 92 |
| 89 #endif // WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ | 93 #endif // WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ |
| OLD | NEW |