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 #include <ostream> | 16 #include <ostream> |
17 #include <string> | 17 #include <string> |
18 #include <vector> | 18 #include <vector> |
19 | 19 |
| 20 #include "webrtc/api/array_view.h" |
20 #include "webrtc/api/video/video_content_type.h" | 21 #include "webrtc/api/video/video_content_type.h" |
21 #include "webrtc/api/video/video_rotation.h" | 22 #include "webrtc/api/video/video_rotation.h" |
22 #include "webrtc/api/video/video_timing.h" | 23 #include "webrtc/api/video/video_timing.h" |
23 #include "webrtc/rtc_base/array_view.h" | |
24 #include "webrtc/rtc_base/checks.h" | 24 #include "webrtc/rtc_base/checks.h" |
25 #include "webrtc/rtc_base/deprecation.h" | 25 #include "webrtc/rtc_base/deprecation.h" |
26 #include "webrtc/rtc_base/optional.h" | 26 #include "webrtc/rtc_base/optional.h" |
27 #include "webrtc/typedefs.h" | 27 #include "webrtc/typedefs.h" |
28 | 28 |
29 #if defined(_MSC_VER) | 29 #if defined(_MSC_VER) |
30 // Disable "new behavior: elements of array will be default initialized" | 30 // Disable "new behavior: elements of array will be default initialized" |
31 // warning. Affects OverUseDetectorOptions. | 31 // warning. Affects OverUseDetectorOptions. |
32 #pragma warning(disable : 4351) | 32 #pragma warning(disable : 4351) |
33 #endif | 33 #endif |
(...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
966 bool operator==(const RtpKeepAliveConfig& o) const { | 966 bool operator==(const RtpKeepAliveConfig& o) const { |
967 return timeout_interval_ms == o.timeout_interval_ms && | 967 return timeout_interval_ms == o.timeout_interval_ms && |
968 payload_type == o.payload_type; | 968 payload_type == o.payload_type; |
969 } | 969 } |
970 bool operator!=(const RtpKeepAliveConfig& o) const { return !(*this == o); } | 970 bool operator!=(const RtpKeepAliveConfig& o) const { return !(*this == o); } |
971 }; | 971 }; |
972 | 972 |
973 } // namespace webrtc | 973 } // namespace webrtc |
974 | 974 |
975 #endif // WEBRTC_COMMON_TYPES_H_ | 975 #endif // WEBRTC_COMMON_TYPES_H_ |
OLD | NEW |