| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 } | 67 } |
| 68 virtual std::string session_version() const { | 68 virtual std::string session_version() const { |
| 69 return session_version_; | 69 return session_version_; |
| 70 } | 70 } |
| 71 virtual std::string type() const { | 71 virtual std::string type() const { |
| 72 return type_; | 72 return type_; |
| 73 } | 73 } |
| 74 // Allow changing the type. Used for testing. | 74 // Allow changing the type. Used for testing. |
| 75 void set_type(const std::string& type) { type_ = type; } | 75 void set_type(const std::string& type) { type_ = type; } |
| 76 virtual bool AddCandidate(const IceCandidateInterface* candidate); | 76 virtual bool AddCandidate(const IceCandidateInterface* candidate); |
| 77 virtual bool RemoveCandidate(const IceCandidateInterface* candidate); |
| 77 virtual size_t number_of_mediasections() const; | 78 virtual size_t number_of_mediasections() const; |
| 78 virtual const IceCandidateCollection* candidates( | 79 virtual const IceCandidateCollection* candidates( |
| 79 size_t mediasection_index) const; | 80 size_t mediasection_index) const; |
| 80 virtual bool ToString(std::string* out) const; | 81 virtual bool ToString(std::string* out) const; |
| 81 | 82 |
| 82 // Default video encoder settings. The resolution is the max resolution. | 83 // Default video encoder settings. The resolution is the max resolution. |
| 83 // TODO(perkj): Implement proper negotiation of video resolution. | 84 // TODO(perkj): Implement proper negotiation of video resolution. |
| 84 static const int kDefaultVideoCodecId; | 85 static const int kDefaultVideoCodecId; |
| 85 static const int kDefaultVideoCodecFramerate; | 86 static const int kDefaultVideoCodecFramerate; |
| 86 static const char kDefaultVideoCodecName[]; | 87 static const char kDefaultVideoCodecName[]; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 97 | 98 |
| 98 bool GetMediasectionIndex(const IceCandidateInterface* candidate, | 99 bool GetMediasectionIndex(const IceCandidateInterface* candidate, |
| 99 size_t* index); | 100 size_t* index); |
| 100 | 101 |
| 101 RTC_DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription); | 102 RTC_DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription); |
| 102 }; | 103 }; |
| 103 | 104 |
| 104 } // namespace webrtc | 105 } // namespace webrtc |
| 105 | 106 |
| 106 #endif // TALK_APP_WEBRTC_JSEPSESSIONDESCRIPTION_H_ | 107 #endif // TALK_APP_WEBRTC_JSEPSESSIONDESCRIPTION_H_ |
| OLD | NEW |