diff options
| author | fbarchard@google.com <fbarchard@google.com> | 2014-10-20 23:54:14 +0000 |
|---|---|---|
| committer | fbarchard@google.com <fbarchard@google.com> | 2014-10-20 23:54:14 +0000 |
| commit | 5a09c3ef2aa3e6b6da4007746fdde04ca56dae7c (patch) | |
| tree | 06c65645f611d07a4c9e6648504e357b6a71a9e9 | |
| parent | d81dddd3d085452e1a420f900f538ccb7445dd86 (diff) | |
| download | libyuv-5a09c3ef2aa3e6b6da4007746fdde04ca56dae7c.tar.gz | |
remove ppapi/c/pp_macros.h dependency and assume m37 is available.
BUG=374
TESTED=untested
R=nfullagar@chromium.org, tpsiaki@google.com
Review URL: https://webrtc-codereview.appspot.com/26769005
git-svn-id: http://libyuv.googlecode.com/svn/trunk@1130 16f28f9a-4ce2-e073-06de-1de4eb20be90
| -rw-r--r-- | BUILD.gn | 1 | ||||
| -rw-r--r-- | README.chromium | 2 | ||||
| -rw-r--r-- | include/libyuv/row.h | 21 | ||||
| -rw-r--r-- | include/libyuv/version.h | 2 |
4 files changed, 2 insertions, 24 deletions
@@ -84,7 +84,6 @@ source_set("libyuv") { } deps = [ - "//ppapi:ppapi_macros", # Allow include of pp_macros.h. "//third_party:jpeg", ] diff --git a/README.chromium b/README.chromium index d86bde5..90ff5c2 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1127 +Version: 1130 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index 5a4c497..058122b 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -15,10 +15,6 @@ #include "libyuv/basic_types.h" -#if defined(__native_client__) -#include "ppapi/c/pp_macros.h" // For PPAPI_RELEASE -#endif - #ifdef __cplusplus namespace libyuv { extern "C" { @@ -51,13 +47,6 @@ extern "C" { #define LIBYUV_SSSE3_ONLY #endif -// Enable for NaCL pepper 33 for bundle and AVX2 support. -#if defined(__native_client__) && PPAPI_RELEASE >= 33 -#define NEW_BINUTILS -#endif -#if defined(__native_client__) && defined(__arm__) && PPAPI_RELEASE < 37 -#define LIBYUV_DISABLE_NEON -#endif // clang >= 3.5.0 required for Arm64. #if defined(__clang__) && defined(__aarch64__) && !defined(LIBYUV_DISABLE_NEON) #if (__clang_major__ < 3) || (__clang_major__ == 3 && (__clang_minor__ < 5)) @@ -65,7 +54,6 @@ extern "C" { #endif // clang >= 3.5 #endif // __clang__ - // The following are available on all x86 platforms: #if !defined(LIBYUV_DISABLE_X86) && \ (defined(_M_IX86) || defined(__x86_64__) || defined(__i386__)) @@ -497,24 +485,15 @@ typedef uint8 uvec8[16]; #endif // NaCL macros for GCC x86 and x64. - -// TODO(nfullagar): When pepper_33 toolchain is distributed, default to -// NEW_BINUTILS and remove all BUNDLEALIGN occurances. #if defined(__native_client__) #define LABELALIGN ".p2align 5\n" #else #define LABELALIGN ".p2align 2\n" #endif #if defined(__native_client__) && defined(__x86_64__) -#if defined(NEW_BINUTILS) #define BUNDLELOCK ".bundle_lock\n" #define BUNDLEUNLOCK ".bundle_unlock\n" #define BUNDLEALIGN "\n" -#else -#define BUNDLELOCK "\n" -#define BUNDLEUNLOCK "\n" -#define BUNDLEALIGN ".p2align 5\n" -#endif #define MEMACCESS(base) "%%nacl:(%%r15,%q" #base ")" #define MEMACCESS2(offset, base) "%%nacl:" #offset "(%%r15,%q" #base ")" #define MEMLEA(offset, base) #offset "(%q" #base ")" diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 88f948f..2e34fc8 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1127 +#define LIBYUV_VERSION 1130 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT |