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

Unified Diff: source/libvpx/vpx_ports/bitops.h

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 4 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/vpx_mem/vpx_mem.c ('k') | source/libvpx/vpx_ports/msvc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vpx_ports/bitops.h
diff --git a/source/libvpx/vp9/common/vp9_systemdependent.h b/source/libvpx/vpx_ports/bitops.h
similarity index 73%
rename from source/libvpx/vp9/common/vp9_systemdependent.h
rename to source/libvpx/vpx_ports/bitops.h
index fc77762def57fac7cc6467cd914fe67a81821c25..0d3223e32ba3bc27340cf05cecbe4bdbaf870c0b 100644
--- a/source/libvpx/vp9/common/vp9_systemdependent.h
+++ b/source/libvpx/vpx_ports/bitops.h
@@ -8,8 +8,8 @@
* 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_
+#ifndef VPX_PORTS_BITOPS_H_
+#define VPX_PORTS_BITOPS_H_
#include "vpx_ports/msvc.h"
@@ -25,24 +25,6 @@
extern "C" {
#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()
-#else
-#define vp9_clear_system_state()
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1800
-// round is not defined in MSVC before VS2013.
-static INLINE int round(double x) {
- if (x < 0)
- return (int)ceil(x - 0.5);
- else
- return (int)floor(x + 0.5);
-}
-#endif
-
// use GNU builtins where available.
#if defined(__GNUC__) && \
((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
@@ -81,4 +63,4 @@ static INLINE int get_msb(unsigned int n) {
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
+#endif // VPX_PORTS_BITOPS_H_
« no previous file with comments | « source/libvpx/vpx_mem/vpx_mem.c ('k') | source/libvpx/vpx_ports/msvc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698