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

Unified Diff: source/libvpx/vp9/common/vp9_systemdependent.h

Issue 11974002: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/vp9/common/vp9_swapyv12buffer.c ('k') | source/libvpx/vp9/common/vp9_textblit.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vp9/common/vp9_systemdependent.h
===================================================================
--- source/libvpx/vp9/common/vp9_systemdependent.h (revision 177019)
+++ source/libvpx/vp9/common/vp9_systemdependent.h (working copy)
@@ -7,10 +7,15 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
+
#ifndef VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
#define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
-#include "vpx_ports/config.h"
+#ifdef _MSC_VER
+#include <math.h>
+#endif
+
+#include "./vpx_config.h"
#if ARCH_X86 || ARCH_X86_64
void vpx_reset_mmx_state(void);
#define vp9_clear_system_state() vpx_reset_mmx_state()
@@ -18,6 +23,17 @@
#define vp9_clear_system_state()
#endif
+#ifdef _MSC_VER
+// round is not defined in MSVC
+static int round(double x) {
+ if (x < 0)
+ return (int)ceil(x - 0.5);
+ else
+ return (int)floor(x + 0.5);
+}
+#endif
+
struct VP9Common;
void vp9_machine_specific_config(struct VP9Common *);
-#endif
+
+#endif // VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
« no previous file with comments | « source/libvpx/vp9/common/vp9_swapyv12buffer.c ('k') | source/libvpx/vp9/common/vp9_textblit.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698