coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2026-02-08 10:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove ppapi/c/pp_macros.h dependency and assume m37 is available.

Browse Source 
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
This commit is contained in:
fbarchard@google.com 2014-10-20 23:54:14 +00:00
parent d81dddd3d0
commit 5a09c3ef2a
4 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.gn
View File

@ -84,7 +84,6 @@ source_set("libyuv") {
} }
deps = [ deps = [
"//ppapi:ppapi_macros", # Allow include of pp_macros.h.
"//third_party:jpeg", "//third_party:jpeg",
] ]

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 1127 Version: 1130
License: BSD License: BSD
License File: LICENSE License File: LICENSE

21
include/libyuv/row.h
View File

@ -15,10 +15,6 @@
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
#if defined(__native_client__)
#include "ppapi/c/pp_macros.h" // For PPAPI_RELEASE
#endif
#ifdef __cplusplus #ifdef __cplusplus
namespace libyuv { namespace libyuv {
extern "C" { extern "C" {
@ -51,13 +47,6 @@ extern "C" {
#define LIBYUV_SSSE3_ONLY #define LIBYUV_SSSE3_ONLY
#endif #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. // clang >= 3.5.0 required for Arm64.
#if defined(__clang__) && defined(__aarch64__) && !defined(LIBYUV_DISABLE_NEON) #if defined(__clang__) && defined(__aarch64__) && !defined(LIBYUV_DISABLE_NEON)
#if (__clang_major__ < 3) || (__clang_major__ == 3 && (__clang_minor__ < 5)) #if (__clang_major__ < 3) || (__clang_major__ == 3 && (__clang_minor__ < 5))
@ -65,7 +54,6 @@ extern "C" {
#endif // clang >= 3.5 #endif // clang >= 3.5
#endif // __clang__ #endif // __clang__
// The following are available on all x86 platforms: // The following are available on all x86 platforms:
#if !defined(LIBYUV_DISABLE_X86) && \ #if !defined(LIBYUV_DISABLE_X86) && \
(defined(_M_IX86) || defined(__x86_64__) || defined(__i386__)) (defined(_M_IX86) || defined(__x86_64__) || defined(__i386__))
@ -497,24 +485,15 @@ typedef uint8 uvec8[16];
#endif #endif
// NaCL macros for GCC x86 and x64. // 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__) #if defined(__native_client__)
#define LABELALIGN ".p2align 5\n" #define LABELALIGN ".p2align 5\n"
#else #else
#define LABELALIGN ".p2align 2\n" #define LABELALIGN ".p2align 2\n"
#endif #endif
#if defined(__native_client__) && defined(__x86_64__) #if defined(__native_client__) && defined(__x86_64__)
#if defined(NEW_BINUTILS)
#define BUNDLELOCK ".bundle_lock\n" #define BUNDLELOCK ".bundle_lock\n"
#define BUNDLEUNLOCK ".bundle_unlock\n" #define BUNDLEUNLOCK ".bundle_unlock\n"
#define BUNDLEALIGN "\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 MEMACCESS(base) "%%nacl:(%%r15,%q" #base ")"
#define MEMACCESS2(offset, base) "%%nacl:" #offset "(%%r15,%q" #base ")" #define MEMACCESS2(offset, base) "%%nacl:" #offset "(%%r15,%q" #base ")"
#define MEMLEA(offset, base) #offset "(%q" #base ")" #define MEMLEA(offset, base) #offset "(%q" #base ")"

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1127 #define LIBYUV_VERSION 1130
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT