Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: source/libvpx/vp9/common/vp9_systemdependent.h

Issue 23922008: Get libvpx to compile on VS2013. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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> 15 #include <math.h>
16 #endif 16 #endif
17 17
18 #include "./vpx_config.h" 18 #include "./vpx_config.h"
19 #if ARCH_X86 || ARCH_X86_64 19 #if ARCH_X86 || ARCH_X86_64
20 void vpx_reset_mmx_state(void); 20 void vpx_reset_mmx_state(void);
21 #define vp9_clear_system_state() vpx_reset_mmx_state() 21 #define vp9_clear_system_state() vpx_reset_mmx_state()
22 #else 22 #else
23 #define vp9_clear_system_state() 23 #define vp9_clear_system_state()
24 #endif 24 #endif
25 25
26 #ifdef _MSC_VER 26 #if defined(_MSC_VER) && _MSC_VER < 1800
27 // round is not defined in MSVC 27 // round is not defined in MSVC before VS2013.
28 static int round(double x) { 28 static int round(double x) {
29 if (x < 0) 29 if (x < 0)
30 return (int)ceil(x - 0.5); 30 return (int)ceil(x - 0.5);
31 else 31 else
32 return (int)floor(x + 0.5); 32 return (int)floor(x + 0.5);
33 } 33 }
34 #endif 34 #endif
35 35
36 struct VP9Common; 36 struct VP9Common;
37 void vp9_machine_specific_config(struct VP9Common *cm); 37 void vp9_machine_specific_config(struct VP9Common *cm);
38 38
39 #endif // VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ 39 #endif // VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698