| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2010 The WebM 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 VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ | 11 #ifndef VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ |
| 12 #define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ | 12 #define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ |
| 13 | 13 |
| 14 #ifdef _MSC_VER | 14 #ifdef _MSC_VER |
| 15 # include <math.h> // the ceil() definition must precede intrin.h | 15 # include <math.h> // the ceil() definition must precede intrin.h |
| 16 # if _MSC_VER > 1310 && (defined(_M_X64) || defined(_M_IX86)) | 16 # if _MSC_VER > 1310 && (defined(_M_X64) || defined(_M_IX86)) |
| 17 # include <intrin.h> | 17 # include <intrin.h> |
| 18 # define USE_MSC_INTRIN | 18 # define USE_MSC_INTRIN |
| 19 # endif | 19 # endif |
| 20 #if _MSC_VER < 1900 |
| 20 # define snprintf _snprintf | 21 # define snprintf _snprintf |
| 21 #endif | 22 #endif |
| 23 #endif |
| 22 | 24 |
| 23 #ifdef __cplusplus | 25 #ifdef __cplusplus |
| 24 extern "C" { | 26 extern "C" { |
| 25 #endif | 27 #endif |
| 26 | 28 |
| 27 #include "./vpx_config.h" | 29 #include "./vpx_config.h" |
| 28 #if ARCH_X86 || ARCH_X86_64 | 30 #if ARCH_X86 || ARCH_X86_64 |
| 29 void vpx_reset_mmx_state(void); | 31 void vpx_reset_mmx_state(void); |
| 30 #define vp9_clear_system_state() vpx_reset_mmx_state() | 32 #define vp9_clear_system_state() vpx_reset_mmx_state() |
| 31 #else | 33 #else |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 } | 76 } |
| 75 return log; | 77 return log; |
| 76 } | 78 } |
| 77 #endif | 79 #endif |
| 78 | 80 |
| 79 #ifdef __cplusplus | 81 #ifdef __cplusplus |
| 80 } // extern "C" | 82 } // extern "C" |
| 81 #endif | 83 #endif |
| 82 | 84 |
| 83 #endif // VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ | 85 #endif // VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ |
| OLD | NEW |