Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2015 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 GENERIC_NACK, | 60 GENERIC_NACK, |
| 61 PLI, // Usable with NACK. | 61 PLI, // Usable with NACK. |
| 62 FIR, // Usable with CCM. | 62 FIR, // Usable with CCM. |
| 63 }; | 63 }; |
| 64 | 64 |
| 65 enum class DtxStatus { | 65 enum class DtxStatus { |
| 66 DISABLED, | 66 DISABLED, |
| 67 ENABLED, | 67 ENABLED, |
| 68 }; | 68 }; |
| 69 | 69 |
| 70 enum class DegradationPreference { | 70 enum class RtpDegradationPreference { |
|
Zhi Huang
2017/03/31 06:44:05
This is changed because it accidentally conflict w
Taylor Brandstetter
2017/03/31 22:10:50
It looks like the two enums are referring to the s
| |
| 71 MAINTAIN_FRAMERATE, | 71 MAINTAIN_FRAMERATE, |
| 72 MAINTAIN_RESOLUTION, | 72 MAINTAIN_RESOLUTION, |
| 73 BALANCED, | 73 BALANCED, |
| 74 }; | 74 }; |
| 75 | 75 |
| 76 enum class PriorityType { VERY_LOW, LOW, MEDIUM, HIGH }; | 76 enum class PriorityType { VERY_LOW, LOW, MEDIUM, HIGH }; |
| 77 | 77 |
| 78 struct RtcpFeedback { | 78 struct RtcpFeedback { |
| 79 RtcpFeedbackType type = RtcpFeedbackType::CCM; | 79 RtcpFeedbackType type = RtcpFeedbackType::CCM; |
| 80 | 80 |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 434 std::string mid; | 434 std::string mid; |
| 435 | 435 |
| 436 std::vector<RtpCodecParameters> codecs; | 436 std::vector<RtpCodecParameters> codecs; |
| 437 | 437 |
| 438 // TODO(deadbeef): Not implemented with PeerConnection senders/receivers. | 438 // TODO(deadbeef): Not implemented with PeerConnection senders/receivers. |
| 439 std::vector<RtpHeaderExtensionParameters> header_extensions; | 439 std::vector<RtpHeaderExtensionParameters> header_extensions; |
| 440 | 440 |
| 441 std::vector<RtpEncodingParameters> encodings; | 441 std::vector<RtpEncodingParameters> encodings; |
| 442 | 442 |
| 443 // TODO(deadbeef): Not implemented. | 443 // TODO(deadbeef): Not implemented. |
| 444 DegradationPreference degradation_preference = | 444 RtpDegradationPreference degradation_preference = |
| 445 DegradationPreference::BALANCED; | 445 RtpDegradationPreference::BALANCED; |
| 446 | 446 |
| 447 bool operator==(const RtpParameters& o) const { | 447 bool operator==(const RtpParameters& o) const { |
| 448 return mid == o.mid && codecs == o.codecs && | 448 return mid == o.mid && codecs == o.codecs && |
| 449 header_extensions == o.header_extensions && | 449 header_extensions == o.header_extensions && |
| 450 encodings == o.encodings && | 450 encodings == o.encodings && |
| 451 degradation_preference == o.degradation_preference; | 451 degradation_preference == o.degradation_preference; |
| 452 } | 452 } |
| 453 bool operator!=(const RtpParameters& o) const { return !(*this == o); } | 453 bool operator!=(const RtpParameters& o) const { return !(*this == o); } |
| 454 }; | 454 }; |
| 455 | 455 |
| 456 } // namespace webrtc | 456 } // namespace webrtc |
| 457 | 457 |
| 458 #endif // WEBRTC_API_RTPPARAMETERS_H_ | 458 #endif // WEBRTC_API_RTPPARAMETERS_H_ |
| OLD | NEW |