mirror of
https://chromium.googlesource.com/libyuv/libyuv
synced 2026-01-01 03:12:16 +08:00
Add nacl version check to enable Neon on M37 and bundles for X86 on M33
BUG=333 TESTED=nacl build and validate R=tpsiaki@google.com Review URL: https://webrtc-codereview.appspot.com/20769004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1019 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
parent
e6dd1fa024
commit
1b9df4c5c8
@ -1,6 +1,6 @@
|
||||
Name: libyuv
|
||||
URL: http://code.google.com/p/libyuv/
|
||||
Version: 1018
|
||||
Version: 1019
|
||||
License: BSD
|
||||
License File: LICENSE
|
||||
|
||||
|
||||
@ -15,6 +15,10 @@
|
||||
|
||||
#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" {
|
||||
@ -47,7 +51,12 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
// Enable for NaCL pepper 33 for bundle and AVX2 support.
|
||||
// #define NEW_BINUTILS
|
||||
#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
|
||||
|
||||
// The following are available on all x86 platforms:
|
||||
#if !defined(LIBYUV_DISABLE_X86) && \
|
||||
@ -242,8 +251,7 @@ extern "C" {
|
||||
|
||||
// The following are available on Neon platforms:
|
||||
#if !defined(LIBYUV_DISABLE_NEON) && \
|
||||
(defined(__ARM_NEON__) || defined(LIBYUV_NEON)) && \
|
||||
!defined(__native_client__)
|
||||
(defined(__ARM_NEON__) || defined(LIBYUV_NEON))
|
||||
#define HAS_ABGRTOUVROW_NEON
|
||||
#define HAS_ABGRTOYROW_NEON
|
||||
#define HAS_ARGB1555TOARGBROW_NEON
|
||||
|
||||
@ -11,6 +11,6 @@
|
||||
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
|
||||
#define INCLUDE_LIBYUV_VERSION_H_
|
||||
|
||||
#define LIBYUV_VERSION 1018
|
||||
#define LIBYUV_VERSION 1019
|
||||
|
||||
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
|
||||
|
||||
@ -16,8 +16,7 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
// This module is for GCC Neon
|
||||
#if !defined(LIBYUV_DISABLE_NEON) && defined(__ARM_NEON__) && \
|
||||
!defined(__native_client__)
|
||||
#if !defined(LIBYUV_DISABLE_NEON) && defined(__ARM_NEON__)
|
||||
|
||||
// Read 8 Y, 4 U and 4 V from 422
|
||||
#define READYUV422 \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user