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_content_type.h" | |
22 #include "webrtc/api/video/video_rotation.h" | 21 #include "webrtc/api/video/video_rotation.h" |
23 #include "webrtc/base/checks.h" | 22 #include "webrtc/base/checks.h" |
24 #include "webrtc/base/optional.h" | 23 #include "webrtc/base/optional.h" |
25 #include "webrtc/typedefs.h" | 24 #include "webrtc/typedefs.h" |
26 | 25 |
27 #if defined(_MSC_VER) | 26 #if defined(_MSC_VER) |
28 // Disable "new behavior: elements of array will be default initialized" | 27 // Disable "new behavior: elements of array will be default initialized" |
29 // warning. Affects OverUseDetectorOptions. | 28 // warning. Affects OverUseDetectorOptions. |
30 #pragma warning(disable : 4351) | 29 #pragma warning(disable : 4351) |
31 #endif | 30 #endif |
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
710 bool hasAudioLevel; | 709 bool hasAudioLevel; |
711 bool voiceActivity; | 710 bool voiceActivity; |
712 uint8_t audioLevel; | 711 uint8_t audioLevel; |
713 | 712 |
714 // For Coordination of Video Orientation. See | 713 // For Coordination of Video Orientation. See |
715 // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/ | 714 // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/ |
716 // ts_126114v120700p.pdf | 715 // ts_126114v120700p.pdf |
717 bool hasVideoRotation; | 716 bool hasVideoRotation; |
718 VideoRotation videoRotation; | 717 VideoRotation videoRotation; |
719 | 718 |
720 // TODO(ilnik): Refactor this and one above to be rtc::Optional() and remove | |
721 // a corresponding bool flag. | |
722 bool hasVideoContentType; | |
723 VideoContentType videoContentType; | |
724 | |
725 PlayoutDelay playout_delay = {-1, -1}; | 719 PlayoutDelay playout_delay = {-1, -1}; |
726 }; | 720 }; |
727 | 721 |
728 struct RTPHeader { | 722 struct RTPHeader { |
729 RTPHeader(); | 723 RTPHeader(); |
730 | 724 |
731 bool markerBit; | 725 bool markerBit; |
732 uint8_t payloadType; | 726 uint8_t payloadType; |
733 uint16_t sequenceNumber; | 727 uint16_t sequenceNumber; |
734 uint32_t timestamp; | 728 uint32_t timestamp; |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
841 enum class RtcpMode { kOff, kCompound, kReducedSize }; | 835 enum class RtcpMode { kOff, kCompound, kReducedSize }; |
842 | 836 |
843 enum NetworkState { | 837 enum NetworkState { |
844 kNetworkUp, | 838 kNetworkUp, |
845 kNetworkDown, | 839 kNetworkDown, |
846 }; | 840 }; |
847 | 841 |
848 } // namespace webrtc | 842 } // namespace webrtc |
849 | 843 |
850 #endif // WEBRTC_COMMON_TYPES_H_ | 844 #endif // WEBRTC_COMMON_TYPES_H_ |
OLD | NEW |