Chromium Code Reviews| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 59 // Allow changing the type. Used for testing. | 59 // Allow changing the type. Used for testing. |
| 60 void set_type(const std::string& type) { type_ = type; } | 60 void set_type(const std::string& type) { type_ = type; } |
| 61 virtual bool AddCandidate(const IceCandidateInterface* candidate); | 61 virtual bool AddCandidate(const IceCandidateInterface* candidate); |
| 62 virtual size_t RemoveCandidates( | 62 virtual size_t RemoveCandidates( |
| 63 const std::vector<cricket::Candidate>& candidates); | 63 const std::vector<cricket::Candidate>& candidates); |
| 64 virtual size_t number_of_mediasections() const; | 64 virtual size_t number_of_mediasections() const; |
| 65 virtual const IceCandidateCollection* candidates( | 65 virtual const IceCandidateCollection* candidates( |
| 66 size_t mediasection_index) const; | 66 size_t mediasection_index) const; |
| 67 virtual bool ToString(std::string* out) const; | 67 virtual bool ToString(std::string* out) const; |
| 68 | 68 |
| 69 // Default video encoder settings. The resolution is the max resolution. | |
| 70 // TODO(perkj): Implement proper negotiation of video resolution. | |
| 71 static const int kDefaultVideoCodecId; | 69 static const int kDefaultVideoCodecId; |
| 72 static const int kDefaultVideoCodecFramerate; | 70 static const int kDefaultVideoCodecFramerate; |
|
pthatcher1
2016/10/13 21:33:47
Shouldn't this be removed also?
perkj_webrtc
2016/10/18 12:09:40
yes, thanks.
| |
| 73 static const char kDefaultVideoCodecName[]; | 71 static const char kDefaultVideoCodecName[]; |
| 74 static const int kMaxVideoCodecWidth; | |
| 75 static const int kMaxVideoCodecHeight; | |
| 76 | 72 |
| 77 private: | 73 private: |
| 78 std::unique_ptr<cricket::SessionDescription> description_; | 74 std::unique_ptr<cricket::SessionDescription> description_; |
| 79 std::string session_id_; | 75 std::string session_id_; |
| 80 std::string session_version_; | 76 std::string session_version_; |
| 81 std::string type_; | 77 std::string type_; |
| 82 std::vector<JsepCandidateCollection> candidate_collection_; | 78 std::vector<JsepCandidateCollection> candidate_collection_; |
| 83 | 79 |
| 84 bool GetMediasectionIndex(const IceCandidateInterface* candidate, | 80 bool GetMediasectionIndex(const IceCandidateInterface* candidate, |
| 85 size_t* index); | 81 size_t* index); |
| 86 int GetMediasectionIndex(const cricket::Candidate& candidate); | 82 int GetMediasectionIndex(const cricket::Candidate& candidate); |
| 87 | 83 |
| 88 RTC_DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription); | 84 RTC_DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription); |
| 89 }; | 85 }; |
| 90 | 86 |
| 91 } // namespace webrtc | 87 } // namespace webrtc |
| 92 | 88 |
| 93 #endif // WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ | 89 #endif // WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ |
| OLD | NEW |