OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 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 |
11 #ifndef WEBRTC_COMMON_TYPES_H_ | 11 #ifndef WEBRTC_COMMON_TYPES_H_ |
12 #define WEBRTC_COMMON_TYPES_H_ | 12 #define WEBRTC_COMMON_TYPES_H_ |
13 | 13 |
14 #include <stddef.h> | 14 #include <stddef.h> |
15 #include <string.h> | 15 #include <string.h> |
16 | 16 |
17 #include <ostream> | 17 #include <ostream> |
18 #include <string> | 18 #include <string> |
19 #include <vector> | 19 #include <vector> |
20 | 20 |
21 #include "webrtc/api/video/video_rotation.h" | 21 #include "webrtc/api/video/video_rotation.h" |
22 #include "webrtc/api/video/video_content_type.h" | |
22 #include "webrtc/base/checks.h" | 23 #include "webrtc/base/checks.h" |
23 #include "webrtc/base/optional.h" | 24 #include "webrtc/base/optional.h" |
24 #include "webrtc/typedefs.h" | 25 #include "webrtc/typedefs.h" |
25 | 26 |
26 #if defined(_MSC_VER) | 27 #if defined(_MSC_VER) |
27 // Disable "new behavior: elements of array will be default initialized" | 28 // Disable "new behavior: elements of array will be default initialized" |
28 // warning. Affects OverUseDetectorOptions. | 29 // warning. Affects OverUseDetectorOptions. |
29 #pragma warning(disable : 4351) | 30 #pragma warning(disable : 4351) |
30 #endif | 31 #endif |
31 | 32 |
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
710 bool hasAudioLevel; | 711 bool hasAudioLevel; |
711 bool voiceActivity; | 712 bool voiceActivity; |
712 uint8_t audioLevel; | 713 uint8_t audioLevel; |
713 | 714 |
714 // For Coordination of Video Orientation. See | 715 // For Coordination of Video Orientation. See |
715 // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/ | 716 // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/ |
716 // ts_126114v120700p.pdf | 717 // ts_126114v120700p.pdf |
717 bool hasVideoRotation; | 718 bool hasVideoRotation; |
718 VideoRotation videoRotation; | 719 VideoRotation videoRotation; |
719 | 720 |
721 bool hasVideoContentType; | |
722 VideoContentTypeId videoContentType; | |
sprang_webrtc
2017/03/28 11:14:23
Maybe an rtc::Optional<VideoContentTypeId> would b
ilnik
2017/03/28 14:47:02
This CL is already too long. I'll leave it as todo
| |
723 | |
720 PlayoutDelay playout_delay = {-1, -1}; | 724 PlayoutDelay playout_delay = {-1, -1}; |
721 }; | 725 }; |
722 | 726 |
723 struct RTPHeader { | 727 struct RTPHeader { |
724 RTPHeader(); | 728 RTPHeader(); |
725 | 729 |
726 bool markerBit; | 730 bool markerBit; |
727 uint8_t payloadType; | 731 uint8_t payloadType; |
728 uint16_t sequenceNumber; | 732 uint16_t sequenceNumber; |
729 uint32_t timestamp; | 733 uint32_t timestamp; |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
836 enum class RtcpMode { kOff, kCompound, kReducedSize }; | 840 enum class RtcpMode { kOff, kCompound, kReducedSize }; |
837 | 841 |
838 enum NetworkState { | 842 enum NetworkState { |
839 kNetworkUp, | 843 kNetworkUp, |
840 kNetworkDown, | 844 kNetworkDown, |
841 }; | 845 }; |
842 | 846 |
843 } // namespace webrtc | 847 } // namespace webrtc |
844 | 848 |
845 #endif // WEBRTC_COMMON_TYPES_H_ | 849 #endif // WEBRTC_COMMON_TYPES_H_ |
OLD | NEW |