Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 49 ContentDescription* description) | 49 ContentDescription* description) |
| 50 : name(name), | 50 : name(name), |
| 51 type(type), | 51 type(type), |
| 52 rejected(rejected), | 52 rejected(rejected), |
| 53 bundle_only(bundle_only), | 53 bundle_only(bundle_only), |
| 54 description(description) {} | 54 description(description) {} |
| 55 std::string name; | 55 std::string name; |
| 56 std::string type; | 56 std::string type; |
| 57 bool rejected = false; | 57 bool rejected = false; |
| 58 bool bundle_only = false; | 58 bool bundle_only = false; |
| 59 size_t msection_index = -1; | |
|
Taylor Brandstetter
2017/08/09 17:05:11
It's redundant to store this inside ContentInfo, s
Zhi Huang
2017/08/09 21:51:02
This is a good point!
| |
| 59 ContentDescription* description = nullptr; | 60 ContentDescription* description = nullptr; |
| 60 }; | 61 }; |
| 61 | 62 |
| 62 typedef std::vector<std::string> ContentNames; | 63 typedef std::vector<std::string> ContentNames; |
| 63 | 64 |
| 64 // This class provides a mechanism to aggregate different media contents into a | 65 // This class provides a mechanism to aggregate different media contents into a |
| 65 // group. This group can also be shared with the peers in a pre-defined format. | 66 // group. This group can also be shared with the peers in a pre-defined format. |
| 66 // GroupInfo should be populated only with the |content_name| of the | 67 // GroupInfo should be populated only with the |content_name| of the |
| 67 // MediaDescription. | 68 // MediaDescription. |
| 68 class ContentGroup { | 69 class ContentGroup { |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 197 | 198 |
| 198 // Indicates whether a ContentDescription was sent by the local client | 199 // Indicates whether a ContentDescription was sent by the local client |
| 199 // or received from the remote client. | 200 // or received from the remote client. |
| 200 enum ContentSource { | 201 enum ContentSource { |
| 201 CS_LOCAL, CS_REMOTE | 202 CS_LOCAL, CS_REMOTE |
| 202 }; | 203 }; |
| 203 | 204 |
| 204 } // namespace cricket | 205 } // namespace cricket |
| 205 | 206 |
| 206 #endif // WEBRTC_P2P_BASE_SESSIONDESCRIPTION_H_ | 207 #endif // WEBRTC_P2P_BASE_SESSIONDESCRIPTION_H_ |
| OLD | NEW |