| 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 <assert.h> | 14 #include <assert.h> |
| 15 #include <stddef.h> | 15 #include <stddef.h> |
| 16 #include <string.h> | 16 #include <string.h> |
| 17 | 17 |
| 18 #include <string> | 18 #include <string> |
| 19 #include <vector> | 19 #include <vector> |
| 20 | 20 |
| 21 #include "webrtc/api/video/rotation.h" |
| 21 #include "webrtc/base/optional.h" | 22 #include "webrtc/base/optional.h" |
| 22 #include "webrtc/common_video/rotation.h" | |
| 23 #include "webrtc/typedefs.h" | 23 #include "webrtc/typedefs.h" |
| 24 | 24 |
| 25 #if defined(_MSC_VER) | 25 #if defined(_MSC_VER) |
| 26 // Disable "new behavior: elements of array will be default initialized" | 26 // Disable "new behavior: elements of array will be default initialized" |
| 27 // warning. Affects OverUseDetectorOptions. | 27 // warning. Affects OverUseDetectorOptions. |
| 28 #pragma warning(disable : 4351) | 28 #pragma warning(disable : 4351) |
| 29 #endif | 29 #endif |
| 30 | 30 |
| 31 #if defined(WEBRTC_EXPORT) | 31 #if defined(WEBRTC_EXPORT) |
| 32 #define WEBRTC_DLLEXPORT _declspec(dllexport) | 32 #define WEBRTC_DLLEXPORT _declspec(dllexport) |
| (...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 879 enum class RtcpMode { kOff, kCompound, kReducedSize }; | 879 enum class RtcpMode { kOff, kCompound, kReducedSize }; |
| 880 | 880 |
| 881 enum NetworkState { | 881 enum NetworkState { |
| 882 kNetworkUp, | 882 kNetworkUp, |
| 883 kNetworkDown, | 883 kNetworkDown, |
| 884 }; | 884 }; |
| 885 | 885 |
| 886 } // namespace webrtc | 886 } // namespace webrtc |
| 887 | 887 |
| 888 #endif // WEBRTC_COMMON_TYPES_H_ | 888 #endif // WEBRTC_COMMON_TYPES_H_ |
| OLD | NEW |